From f17fb7bf4929ce1d3eb2c0a3d2a496f219f61460 Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Fri, 3 Apr 2026 10:56:06 +0200 Subject: [PATCH] Upgrade to kit v0.3.0 Signed-off-by: Bryan Frimin --- .../main.go | 2 +- go.mod | 32 ++--- go.sum | 72 +++++------ pkg/accessreview/access_entry_service.go | 24 ++-- pkg/accessreview/access_source_service.go | 24 ++-- pkg/accessreview/campaign_service.go | 32 ++--- pkg/accessreview/drivers/probo_memberships.go | 2 +- pkg/accessreview/review_engine.go | 20 +-- pkg/accessreview/service.go | 2 +- pkg/accessreview/source_name_worker.go | 12 +- pkg/accessreview/worker.go | 18 +-- pkg/certmanager/acme_challenge_handler.go | 2 +- pkg/certmanager/cache_store.go | 4 +- pkg/certmanager/provisioner.go | 10 +- pkg/certmanager/renewer.go | 4 +- pkg/certmanager/selector.go | 4 +- pkg/coredata/access_entry.go | 28 ++--- pkg/coredata/access_entry_decision_history.go | 6 +- pkg/coredata/access_entry_statistics.go | 4 +- pkg/coredata/access_review_campaign.go | 16 +-- .../access_review_campaign_scope_system.go | 12 +- .../access_review_campaign_source_fetch.go | 10 +- pkg/coredata/access_source.go | 18 +-- pkg/coredata/applicability_statement.go | 22 ++-- pkg/coredata/asset.go | 20 +-- pkg/coredata/asset_vendor.go | 8 +- pkg/coredata/audit.go | 26 ++-- pkg/coredata/audit_log_entry.go | 10 +- pkg/coredata/cached_certificate.go | 12 +- pkg/coredata/compliance_external_url.go | 14 +-- pkg/coredata/compliance_framework.go | 16 +-- pkg/coredata/connector.go | 24 ++-- pkg/coredata/control.go | 40 +++--- pkg/coredata/control_audit.go | 4 +- pkg/coredata/control_document.go | 6 +- pkg/coredata/control_mesure.go | 6 +- pkg/coredata/control_obligation.go | 6 +- pkg/coredata/control_snapshot.go | 4 +- pkg/coredata/custom_domain.go | 26 ++-- .../data_protection_impact_assessment.go | 20 +-- pkg/coredata/datum.go | 22 ++-- pkg/coredata/datum_vendor.go | 6 +- pkg/coredata/document.go | 42 +++---- pkg/coredata/document_version.go | 20 +-- .../document_version_approval_decision.go | 20 +-- .../document_version_approval_quorum.go | 16 +-- pkg/coredata/document_version_signature.go | 20 +-- pkg/coredata/electronic_signature.go | 14 +-- pkg/coredata/electronic_signature_event.go | 4 +- pkg/coredata/email.go | 12 +- pkg/coredata/email_attachment.go | 4 +- pkg/coredata/evidence.go | 24 ++-- pkg/coredata/export_job.go | 10 +- pkg/coredata/file.go | 12 +- pkg/coredata/finding.go | 20 +-- pkg/coredata/finding_audit.go | 4 +- pkg/coredata/framework.go | 18 +-- pkg/coredata/identity.go | 14 +-- pkg/coredata/invitation.go | 14 +-- pkg/coredata/mailing_list.go | 8 +- pkg/coredata/mailing_list_subscriber.go | 18 +-- pkg/coredata/mailing_list_update.go | 20 +-- pkg/coredata/measure.go | 28 ++--- pkg/coredata/meeting.go | 14 +-- pkg/coredata/meeting_attendee.go | 2 +- pkg/coredata/membership.go | 16 +-- pkg/coredata/membership_profile.go | 36 +++--- pkg/coredata/obligation.go | 24 ++-- pkg/coredata/oidc_state.go | 8 +- pkg/coredata/organization.go | 16 +-- pkg/coredata/organization_context.go | 6 +- pkg/coredata/personal_api_key.go | 14 +-- pkg/coredata/processing_activities.go | 20 +-- pkg/coredata/processing_activity_vendor.go | 8 +- pkg/coredata/report.go | 12 +- pkg/coredata/rights_requests.go | 14 +-- pkg/coredata/risk.go | 28 ++--- pkg/coredata/risk_document.go | 6 +- pkg/coredata/risk_mesure.go | 4 +- pkg/coredata/risk_obligation.go | 4 +- pkg/coredata/saml_assertion.go | 4 +- pkg/coredata/saml_configuration.go | 24 ++-- pkg/coredata/saml_request.go | 6 +- pkg/coredata/scim_bridge.go | 16 +-- pkg/coredata/scim_configuration.go | 14 +-- pkg/coredata/scim_event.go | 14 +-- pkg/coredata/session.go | 16 +-- pkg/coredata/slack_message.go | 22 ++-- pkg/coredata/snapshot.go | 14 +-- pkg/coredata/snapshottable.go | 2 +- pkg/coredata/state_of_applicability.go | 20 +-- pkg/coredata/task.go | 26 ++-- pkg/coredata/token.go | 6 +- pkg/coredata/transfer_impact_assessment.go | 20 +-- pkg/coredata/trust_center.go | 14 +-- pkg/coredata/trust_center_access.go | 14 +-- pkg/coredata/trust_center_document_access.go | 50 ++++---- pkg/coredata/trust_center_file.go | 18 +-- pkg/coredata/trust_center_reference.go | 16 +-- pkg/coredata/vendor.go | 42 +++---- .../vendor_business_associate_agreement.go | 16 +-- pkg/coredata/vendor_compliance_report.go | 12 +- pkg/coredata/vendor_contact.go | 14 +-- pkg/coredata/vendor_data_privacy_agreement.go | 16 +-- pkg/coredata/vendor_risk_assessment.go | 12 +- pkg/coredata/vendor_service.go | 14 +-- pkg/coredata/webhook_data.go | 6 +- pkg/coredata/webhook_event.go | 8 +- pkg/coredata/webhook_subscription.go | 18 +-- pkg/esign/completion_certificate_worker.go | 12 +- pkg/esign/sealing_worker.go | 10 +- pkg/esign/service.go | 20 +-- pkg/file/service.go | 2 +- pkg/iam/account_service.go | 40 +++--- pkg/iam/api_key.go | 2 +- pkg/iam/auth_service.go | 20 +-- pkg/iam/authorizer.go | 28 ++--- pkg/iam/compliance_page_service.go | 4 +- pkg/iam/oidc/gc.go | 2 +- pkg/iam/oidc/service.go | 6 +- pkg/iam/organization_service.go | 86 ++++++------- pkg/iam/saml/gc.go | 2 +- pkg/iam/saml/service.go | 4 +- pkg/iam/saml_domain_verifier.go | 4 +- pkg/iam/scim/bridge_runner_state.go | 16 +-- pkg/iam/scim/bridge_runner_sync.go | 14 +-- pkg/iam/scim/service.go | 18 +-- pkg/iam/service.go | 14 +-- pkg/iam/session_service.go | 20 +-- pkg/mailer/mailer.go | 10 +- pkg/mailman/compliance_mailing_list.go | 2 +- pkg/mailman/mailing_list_worker.go | 12 +- pkg/mailman/service.go | 68 +++++------ pkg/probo/asset_service.go | 18 +-- pkg/probo/audit_service.go | 30 ++--- pkg/probo/compliance_external_url_service.go | 8 +- pkg/probo/compliance_framework_service.go | 8 +- pkg/probo/connector_service.go | 26 ++-- pkg/probo/control_service.go | 114 +++++++++--------- pkg/probo/custom_domain_service.go | 6 +- ...ta_protection_impact_assessment_service.go | 16 +-- pkg/probo/datum_service.go | 20 +-- pkg/probo/document_approval_service.go | 42 +++---- pkg/probo/document_service.go | 114 +++++++++--------- pkg/probo/evidence_description_worker.go | 10 +- pkg/probo/evidence_service.go | 18 +-- pkg/probo/file_service.go | 6 +- pkg/probo/finding_service.go | 32 ++--- pkg/probo/framework_service.go | 30 ++--- pkg/probo/measure_service.go | 26 ++-- pkg/probo/meeting_service.go | 14 +-- pkg/probo/obligation_service.go | 18 +-- pkg/probo/organization_service.go | 16 +-- pkg/probo/processing_activity_service.go | 18 +-- pkg/probo/report_service.go | 6 +- pkg/probo/rights_request_service.go | 12 +- pkg/probo/risk_service.go | 90 +++++++------- pkg/probo/service.go | 16 +-- pkg/probo/snapshot_service.go | 18 +-- pkg/probo/state_of_applicability_service.go | 30 ++--- pkg/probo/task_service.go | 22 ++-- .../transfer_impact_assessment_service.go | 16 +-- pkg/probo/trust_center_access_service.go | 18 +-- pkg/probo/trust_center_file_service.go | 16 +-- pkg/probo/trust_center_reference_service.go | 16 +-- pkg/probo/trust_center_service.go | 24 ++-- ...or_business_associate_agreement_service.go | 14 +-- pkg/probo/vendor_compliance_report_service.go | 16 +-- pkg/probo/vendor_contact_service.go | 10 +- .../vendor_data_privacy_agreement_service.go | 14 +-- pkg/probo/vendor_service.go | 32 ++--- pkg/probo/vendor_service_service.go | 10 +- pkg/probo/webhook_subscription_service.go | 18 +-- pkg/slack/sender.go | 8 +- pkg/slack/service.go | 2 +- pkg/slack/slack_message_service.go | 8 +- pkg/trust/audit_service.go | 6 +- pkg/trust/compliance_external_url_service.go | 2 +- pkg/trust/compliance_framework_service.go | 2 +- pkg/trust/document_service.go | 8 +- pkg/trust/framework_service.go | 6 +- pkg/trust/organization_service.go | 6 +- pkg/trust/report_service.go | 2 +- pkg/trust/service.go | 18 +-- pkg/trust/trust_center_access_service.go | 18 +-- pkg/trust/trust_center_file_service.go | 6 +- pkg/trust/trust_center_reference_service.go | 6 +- pkg/trust/trust_center_service.go | 16 +-- pkg/trust/vendor_service.go | 6 +- pkg/webhook/data.go | 6 +- pkg/webhook/sender.go | 6 +- 191 files changed, 1617 insertions(+), 1617 deletions(-) diff --git a/cmd/migrate-document-versions-markdown/main.go b/cmd/migrate-document-versions-markdown/main.go index f7900d21b..38eb0a599 100644 --- a/cmd/migrate-document-versions-markdown/main.go +++ b/cmd/migrate-document-versions-markdown/main.go @@ -127,7 +127,7 @@ ORDER BY id; return nil } -func migrateOne(ctx context.Context, conn pg.Conn, idStr string, dryRun bool) error { +func migrateOne(ctx context.Context, conn pg.Querier, idStr string, dryRun bool) error { versionID, err := gid.ParseGID(idStr) if err != nil { return fmt.Errorf("invalid document version id %q: %w", idStr, err) diff --git a/go.mod b/go.mod index ec3dae28f..5d83c9239 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/digitorus/timestamp v0.0.0-20250524132541-c45532741eea github.com/go-chi/chi/v5 v5.2.5 github.com/go-chi/cors v1.2.2 - github.com/jackc/pgx/v5 v5.8.0 + github.com/jackc/pgx/v5 v5.9.1 github.com/jhillyerd/enmime v1.3.0 github.com/microcosm-cc/bluemonday v1.0.27 github.com/modelcontextprotocol/go-sdk v1.4.1 @@ -35,10 +35,10 @@ require ( github.com/vikstrous/dataloadgen v0.0.10 github.com/yuin/goldmark v1.4.13 go.gearno.de/crypto/uuid v0.1.1-0.20251208105319-3f587312a712 - go.gearno.de/kit v0.1.1 + go.gearno.de/kit v0.3.0 go.gearno.de/x/ref v0.0.0-20260216110753-a700c951377c - go.opentelemetry.io/otel v1.40.0 - go.opentelemetry.io/otel/trace v1.40.0 + go.opentelemetry.io/otel v1.42.0 + go.opentelemetry.io/otel/trace v1.42.0 go.probo.inc/mcpgen v0.0.0-20260223192226-386b1fbe6184 golang.org/x/crypto v0.49.0 golang.org/x/image v0.38.0 @@ -104,7 +104,7 @@ require ( github.com/digitorus/pkcs7 v0.0.0-20230713084857-e76b763bdc49 // indirect github.com/dnephin/pflag v1.0.7 // indirect github.com/elimity-com/scim v0.0.0-20240320110924-172bf2aee9c8 - github.com/fatih/color v1.18.0 // indirect + github.com/fatih/color v1.19.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/go-json-experiment/json v0.0.0-20251027170946-4849db3c2f7e // indirect @@ -123,7 +123,7 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.3.12 // indirect github.com/googleapis/gax-go/v2 v2.17.0 // indirect github.com/gorilla/websocket v1.5.3 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hhrutter/lzw v1.0.0 // indirect github.com/hhrutter/pkcs7 v0.2.0 // indirect @@ -144,7 +144,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.67.5 // indirect - github.com/prometheus/procfs v0.20.0 // indirect + github.com/prometheus/procfs v0.20.1 // indirect github.com/russellhaering/goxmldsig v1.6.0 // indirect github.com/segmentio/asm v1.1.3 // indirect github.com/segmentio/encoding v0.5.4 // indirect @@ -161,21 +161,21 @@ require ( go.gearno.de/x/panicf v0.1.1 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.40.0 // indirect - go.opentelemetry.io/otel/metric v1.40.0 // indirect - go.opentelemetry.io/otel/sdk v1.40.0 - go.opentelemetry.io/proto/otlp v1.9.0 // indirect - go.yaml.in/yaml/v2 v2.4.3 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0 // indirect + go.opentelemetry.io/otel/metric v1.42.0 // indirect + go.opentelemetry.io/otel/sdk v1.42.0 + go.opentelemetry.io/proto/otlp v1.10.0 // indirect + go.yaml.in/yaml/v2 v2.4.4 // indirect golang.org/x/mod v0.34.0 // indirect golang.org/x/net v0.52.0 golang.org/x/sys v0.42.0 // indirect golang.org/x/term v0.41.0 golang.org/x/text v0.35.0 // indirect golang.org/x/tools v0.43.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect - google.golang.org/grpc v1.79.3 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect + google.golang.org/grpc v1.80.0 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gotest.tools/gotestsum v1.13.0 // indirect diff --git a/go.sum b/go.sum index 0ba1bdcda..b72e51882 100644 --- a/go.sum +++ b/go.sum @@ -133,8 +133,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4= github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM= -github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= -github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w= +github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= @@ -190,8 +190,8 @@ github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 h1:X+2YciYSxvMQK0UZ7sg45ZVabVZBeBuvMkmuI2V3Fak= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7/go.mod h1:lW34nIZuQ8UDPdkon5fmfp2l3+ZkQ2me/+oecHYLOII= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hhrutter/lzw v1.0.0 h1:laL89Llp86W3rRs83LvKbwYRx6INE8gDn0XNb1oXtm0= @@ -206,8 +206,8 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgx/v5 v5.8.0 h1:TYPDoleBBme0xGSAX3/+NujXXtpZn9HBONkQC7IEZSo= -github.com/jackc/pgx/v5 v5.8.0/go.mod h1:QVeDInX2m9VyzvNeiCJVjCkNFqzsNb43204HshNSZKw= +github.com/jackc/pgx/v5 v5.9.1 h1:uwrxJXBnx76nyISkhr33kQLlUqjv7et7b9FjCen/tdc= +github.com/jackc/pgx/v5 v5.9.1/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4= github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jaytaylor/html2text v0.0.0-20230321000545-74c2419ad056 h1:iCHtR9CQyktQ5+f3dMVZfwD2KWJUgm7M0gdL9NGr8KA= @@ -273,8 +273,8 @@ github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNw github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4= github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw= -github.com/prometheus/procfs v0.20.0 h1:AA7aCvjxwAquZAlonN7888f2u4IN8WVeFgBi4k82M4Q= -github.com/prometheus/procfs v0.20.0/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo= +github.com/prometheus/procfs v0.20.1 h1:XwbrGOIplXW/AU3YhIhLODXMJYyC1isLFfYCsTEycfc= +github.com/prometheus/procfs v0.20.1/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= @@ -332,8 +332,8 @@ github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.gearno.de/crypto/uuid v0.1.1-0.20251208105319-3f587312a712 h1:J5ccbcxFuwxe6Oa9fVi9FqQOo+n17ni4wbl9t4NuEzc= go.gearno.de/crypto/uuid v0.1.1-0.20251208105319-3f587312a712/go.mod h1:fnIIvKO9QnsyLO3ZJLJT3r8KZv/p0FOeT5eZKilYWXg= -go.gearno.de/kit v0.1.1 h1:QuBZCZ/h2Eyh6DjjR6CGjkdsab/ztHz6xUiIk0FeREE= -go.gearno.de/kit v0.1.1/go.mod h1:WI/gQ14O9M6wsKa/HFL4ZH+Q/U0930hYWZRdHHo9Agk= +go.gearno.de/kit v0.3.0 h1:c+0wY9ydGQIbLNvkcDv/1geC9htv1z2GDMOPxkZzoM4= +go.gearno.de/kit v0.3.0/go.mod h1:jWrI/mxd0F4GZApL0HgMextcEQoiy2YA1JVamSA/G0E= go.gearno.de/x/panicf v0.1.1 h1:E3Cr9NB8Ry2EsvEG/1eHr7kplP3tEjTf5d56dTX64VQ= go.gearno.de/x/panicf v0.1.1/go.mod h1:VnB8oF0UefMZcYeD4v+Wk4U5Z1uza7PHLlhT2CbNEbU= go.gearno.de/x/ref v0.0.0-20260216110753-a700c951377c h1:rIVWwnNxHYu9aZhHkptXlNYTBJbY4ccaIAYjztVeaDc= @@ -342,28 +342,28 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= -go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms= -go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 h1:QKdN8ly8zEMrByybbQgv8cWBcdAarwmIPZ6FThrWXJs= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0/go.mod h1:bTdK1nhqF76qiPoCCdyFIV+N/sRHYXYCTQc+3VCi3MI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.40.0 h1:wVZXIWjQSeSmMoxF74LzAnpVQOAFDo3pPji9Y4SOFKc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.40.0/go.mod h1:khvBS2IggMFNwZK/6lEeHg/W57h/IX6J4URh57fuI40= -go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g= -go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc= -go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8= -go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE= -go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw= -go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg= -go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw= -go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA= -go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A= -go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4= +go.opentelemetry.io/otel v1.42.0 h1:lSQGzTgVR3+sgJDAU/7/ZMjN9Z+vUip7leaqBKy4sho= +go.opentelemetry.io/otel v1.42.0/go.mod h1:lJNsdRMxCUIWuMlVJWzecSMuNjE7dOYyWlqOXWkdqCc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 h1:THuZiwpQZuHPul65w4WcwEnkX2QIuMT+UFoOrygtoJw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0/go.mod h1:J2pvYM5NGHofZ2/Ru6zw/TNWnEQp5crgyDeSrYpXkAw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0 h1:uLXP+3mghfMf7XmV4PkGfFhFKuNWoCvvx5wP/wOXo0o= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0/go.mod h1:v0Tj04armyT59mnURNUJf7RCKcKzq+lgJs6QSjHjaTc= +go.opentelemetry.io/otel/metric v1.42.0 h1:2jXG+3oZLNXEPfNmnpxKDeZsFI5o4J+nz6xUlaFdF/4= +go.opentelemetry.io/otel/metric v1.42.0/go.mod h1:RlUN/7vTU7Ao/diDkEpQpnz3/92J9ko05BIwxYa2SSI= +go.opentelemetry.io/otel/sdk v1.42.0 h1:LyC8+jqk6UJwdrI/8VydAq/hvkFKNHZVIWuslJXYsDo= +go.opentelemetry.io/otel/sdk v1.42.0/go.mod h1:rGHCAxd9DAph0joO4W6OPwxjNTYWghRWmkHuGbayMts= +go.opentelemetry.io/otel/sdk/metric v1.42.0 h1:D/1QR46Clz6ajyZ3G8SgNlTJKBdGp84q9RKCAZ3YGuA= +go.opentelemetry.io/otel/sdk/metric v1.42.0/go.mod h1:Ua6AAlDKdZ7tdvaQKfSmnFTdHx37+J4ba8MwVCYM5hc= +go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY= +go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc= +go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g= +go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= go.probo.inc/mcpgen v0.0.0-20260223192226-386b1fbe6184 h1:LH9uUR10Nt6ixEAtr7M8Drg97Ei519WEWM1mSWLkrhQ= go.probo.inc/mcpgen v0.0.0-20260223192226-386b1fbe6184/go.mod h1:HunWQGqLdMocExJh4tWaX7p+uRZ9GlKvBvOXHaFW6vM= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= -go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= +go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ= +go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= go.yaml.in/yaml/v4 v4.0.0-rc.3 h1:3h1fjsh1CTAPjW7q/EMe+C8shx5d8ctzZTrLcs/j8Go= @@ -394,18 +394,18 @@ golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s= golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0= -gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= -gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= +gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= +gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= google.golang.org/api v0.269.0 h1:qDrTOxKUQ/P0MveH6a7vZ+DNHxJQjtGm/uvdbdGXCQg= google.golang.org/api v0.269.0/go.mod h1:N8Wpcu23Tlccl0zSHEkcAZQKDLdquxK+l9r2LkwAauE= google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 h1:VQZ/yAbAtjkHgH80teYd2em3xtIkkHd7ZhqfH2N9CsM= google.golang.org/genproto v0.0.0-20260128011058-8636f8732409/go.mod h1:rxKD3IEILWEu3P44seeNOAwZN4SaoKaQ/2eTg4mM6EM= -google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 h1:merA0rdPeUV3YIIfHHcH4qBkiQAc1nfCKSI7lB4cV2M= -google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409/go.mod h1:fl8J1IvUjCilwZzQowmw2b7HQB2eAuYBabMXzWurF+I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d h1:t/LOSXPJ9R0B6fnZNyALBRfZBH0Uy0gT+uR+SJ6syqQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE= -google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ= +google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA= +google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM= +google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/accessreview/access_entry_service.go b/pkg/accessreview/access_entry_service.go index cc45186d4..d20a991e5 100644 --- a/pkg/accessreview/access_entry_service.go +++ b/pkg/accessreview/access_entry_service.go @@ -54,7 +54,7 @@ func (s AccessEntryService) Get( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return entry.LoadByID(ctx, conn, s.scope, entryID) }, ) @@ -83,7 +83,7 @@ func (s AccessEntryService) RecordDecision( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := entry.LoadByID(ctx, conn, s.scope, req.EntryID); err != nil { return fmt.Errorf("cannot load access entry: %w", err) } @@ -173,7 +173,7 @@ func (s AccessEntryService) RecordDecisions( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { // Track verified campaigns to avoid repeated loads within the // same transaction. verifiedCampaigns := make(map[gid.GID]bool) @@ -259,7 +259,7 @@ func (s AccessEntryService) FlagEntry( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := entry.LoadByID(ctx, conn, s.scope, req.EntryID); err != nil { return fmt.Errorf("cannot load access entry: %w", err) } @@ -304,7 +304,7 @@ func (s AccessEntryService) ListForCampaignID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return entries.LoadByCampaignID(ctx, conn, s.scope, campaignID, cursor, filter) }, ) @@ -326,7 +326,7 @@ func (s AccessEntryService) ListForCampaignIDAndSourceID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return entries.LoadByCampaignIDAndSourceID(ctx, conn, s.scope, campaignID, sourceID, cursor, filter) }, ) @@ -346,7 +346,7 @@ func (s AccessEntryService) CountForCampaignID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { entries := coredata.AccessEntries{} count, err = entries.CountByCampaignID(ctx, conn, s.scope, campaignID, filter) if err != nil { @@ -372,7 +372,7 @@ func (s AccessEntryService) CountForCampaignIDAndSourceID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { entries := coredata.AccessEntries{} count, err = entries.CountByCampaignIDAndSourceID(ctx, conn, s.scope, campaignID, sourceID, filter) if err != nil { @@ -396,7 +396,7 @@ func (s AccessEntryService) CountPendingForCampaignID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { entries := coredata.AccessEntries{} count, err = entries.CountPendingByCampaignID(ctx, conn, s.scope, campaignID) if err != nil { @@ -420,7 +420,7 @@ func (s AccessEntryService) DecisionHistory( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return histories.LoadByEntryID(ctx, conn, s.scope, entryID) }, ) @@ -439,7 +439,7 @@ func (s AccessEntryService) Statistics( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return stats.LoadByCampaignID(ctx, conn, s.scope, campaignID) }, ) @@ -459,7 +459,7 @@ func (s AccessEntryService) StatisticsForSource( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return stats.LoadByCampaignIDAndSourceID(ctx, conn, s.scope, campaignID, sourceID) }, ) diff --git a/pkg/accessreview/access_source_service.go b/pkg/accessreview/access_source_service.go index f4a6e2913..09ed91ad0 100644 --- a/pkg/accessreview/access_source_service.go +++ b/pkg/accessreview/access_source_service.go @@ -114,7 +114,7 @@ func (s AccessSourceService) Create( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { // Validate connector exists if provided if req.ConnectorID != nil { connector := &coredata.Connector{} @@ -145,7 +145,7 @@ func (s AccessSourceService) Get( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return source.LoadByID(ctx, conn, s.scope, accessSourceID) }, ) @@ -168,7 +168,7 @@ func (s AccessSourceService) Update( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := source.LoadByID(ctx, conn, s.scope, req.AccessSourceID); err != nil { return fmt.Errorf("cannot load access source: %w", err) } @@ -219,7 +219,7 @@ func (s AccessSourceService) Delete( return s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { return source.Delete(ctx, conn, s.scope) }, ) @@ -234,7 +234,7 @@ func (s AccessSourceService) ListForOrganizationID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return sources.LoadByOrganizationID(ctx, conn, s.scope, organizationID, cursor) }, ) @@ -253,7 +253,7 @@ func (s AccessSourceService) CountForOrganizationID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { sources := coredata.AccessSources{} count, err = sources.CountByOrganizationID(ctx, conn, s.scope, organizationID) return err @@ -274,7 +274,7 @@ func (s AccessSourceService) ListScopeSourcesForCampaignID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return sources.LoadScopeSourcesByCampaignID(ctx, conn, s.scope, campaignID) }, ) @@ -296,7 +296,7 @@ func (s AccessSourceService) ConnectorHTTPClient( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := dbConnector.LoadByID(ctx, conn, s.scope, connectorID, s.encryptionKey); err != nil { return fmt.Errorf("cannot load connector: %w", err) } @@ -336,10 +336,10 @@ func (s AccessSourceService) ConnectorHTTPClient( // Persist refreshed token if it changed. if isOAuth2 && oauth2Conn.AccessToken != tokenBefore { dbConnector.UpdatedAt = time.Now() - if err := s.pg.WithConn( + if err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { - return dbConnector.Update(ctx, conn, s.scope, s.encryptionKey) + func(ctx context.Context, tx pg.Tx) error { + return dbConnector.Update(ctx, tx, s.scope, s.encryptionKey) }, ); err != nil { return nil, nil, fmt.Errorf("cannot persist refreshed token: %w", err) @@ -361,7 +361,7 @@ func (s AccessSourceService) ConfigureAccessSource( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := source.LoadByID(ctx, conn, s.scope, req.AccessSourceID); err != nil { return fmt.Errorf("cannot load access source: %w", err) } diff --git a/pkg/accessreview/campaign_service.go b/pkg/accessreview/campaign_service.go index dd3b7b47b..0fe5d768b 100644 --- a/pkg/accessreview/campaign_service.go +++ b/pkg/accessreview/campaign_service.go @@ -59,7 +59,7 @@ func (s *CampaignService) Create( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := campaign.Insert(ctx, conn, s.scope); err != nil { return fmt.Errorf("cannot insert access review campaign: %w", err) } @@ -101,7 +101,7 @@ func (s *CampaignService) Get( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := campaign.LoadByID(ctx, conn, s.scope, campaignID); err != nil { return fmt.Errorf("cannot load campaign: %w", err) } @@ -127,7 +127,7 @@ func (s *CampaignService) Update( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := lockCampaignForUpdate(ctx, conn, s.scope, req.CampaignID); err != nil { return fmt.Errorf("cannot lock campaign: %w", err) } @@ -174,7 +174,7 @@ func (s *CampaignService) Delete( ) error { return s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil { return fmt.Errorf("cannot lock campaign: %w", err) } @@ -205,7 +205,7 @@ func (s *CampaignService) AddScopeSource( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := lockCampaignForUpdate(ctx, conn, s.scope, req.CampaignID); err != nil { return fmt.Errorf("cannot lock campaign: %w", err) } @@ -253,7 +253,7 @@ func (s *CampaignService) RemoveScopeSource( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := lockCampaignForUpdate(ctx, conn, s.scope, req.CampaignID); err != nil { return fmt.Errorf("cannot lock campaign: %w", err) } @@ -292,7 +292,7 @@ func (s *CampaignService) Start( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil { return fmt.Errorf("cannot lock campaign: %w", err) } @@ -346,7 +346,7 @@ func (s *CampaignService) Close( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil { return fmt.Errorf("cannot lock campaign: %w", err) } @@ -388,9 +388,9 @@ func (s *CampaignService) Close( return campaign, nil } -func lockCampaignForUpdate(ctx context.Context, conn pg.Conn, scope coredata.Scoper, campaignID gid.GID) error { +func lockCampaignForUpdate(ctx context.Context, tx pg.Tx, scope coredata.Scoper, campaignID gid.GID) error { c := &coredata.AccessReviewCampaign{ID: campaignID} - if err := c.LockForUpdate(ctx, conn, scope); err != nil { + if err := c.LockForUpdate(ctx, tx, scope); err != nil { return fmt.Errorf("cannot lock campaign for update: %w", err) } return nil @@ -398,7 +398,7 @@ func lockCampaignForUpdate(ctx context.Context, conn pg.Conn, scope coredata.Sco func (s *CampaignService) enqueueSourceFetches( ctx context.Context, - conn pg.Conn, + tx pg.Tx, campaignID gid.GID, sources coredata.AccessSources, ) error { @@ -408,7 +408,7 @@ func (s *CampaignService) enqueueSourceFetches( AccessReviewCampaignID: campaignID, AccessSourceID: source.ID, } - if err := fetch.UpsertQueued(ctx, conn, s.scope, now); err != nil { + if err := fetch.UpsertQueued(ctx, tx, s.scope, now); err != nil { return fmt.Errorf("cannot queue source fetch %s: %w", source.ID, err) } } @@ -424,7 +424,7 @@ func (s *CampaignService) Cancel( err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil { return fmt.Errorf("cannot lock campaign: %w", err) } @@ -466,7 +466,7 @@ func (s *CampaignService) ListForOrganizationID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := campaigns.LoadByOrganizationID(ctx, conn, s.scope, organizationID, cursor); err != nil { return fmt.Errorf("cannot load campaigns by organization: %w", err) } @@ -488,7 +488,7 @@ func (s *CampaignService) ListSourceFetches( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := fetches.LoadByCampaignID(ctx, conn, s.scope, campaignID); err != nil { return fmt.Errorf("cannot load source fetches by campaign: %w", err) } @@ -510,7 +510,7 @@ func (s *CampaignService) CountForOrganizationID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { campaigns := coredata.AccessReviewCampaigns{} count, err = campaigns.CountByOrganizationID(ctx, conn, s.scope, organizationID) if err != nil { diff --git a/pkg/accessreview/drivers/probo_memberships.go b/pkg/accessreview/drivers/probo_memberships.go index ab6020224..dc857d5a9 100644 --- a/pkg/accessreview/drivers/probo_memberships.go +++ b/pkg/accessreview/drivers/probo_memberships.go @@ -49,7 +49,7 @@ func (d *ProboMembershipsDriver) ListAccounts(ctx context.Context) ([]AccountRec err := d.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { accounts, err := coredata.LoadMembershipAccountsByOrganizationID( ctx, conn, diff --git a/pkg/accessreview/review_engine.go b/pkg/accessreview/review_engine.go index 0ba86bee1..71c3b4d11 100644 --- a/pkg/accessreview/review_engine.go +++ b/pkg/accessreview/review_engine.go @@ -73,11 +73,11 @@ func (e *ReviewEngine) FetchSource( baseline []coredata.BaselineAccountEntry ) - err := e.pg.WithConn( + err := e.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { source = &coredata.AccessSource{} - if err := source.LoadByID(ctx, conn, e.scope, sourceID); err != nil { + if err := source.LoadByID(ctx, tx, e.scope, sourceID); err != nil { return fmt.Errorf("cannot load access source %s: %w", sourceID, err) } if source.OrganizationID != campaign.OrganizationID { @@ -85,19 +85,19 @@ func (e *ReviewEngine) FetchSource( } var err error - driver, err = e.resolveDriver(ctx, conn, source) + driver, err = e.resolveDriver(ctx, tx, source) if err != nil { return fmt.Errorf("cannot resolve driver for source %s: %w", source.Name, err) } lastCompletedCampaign := &coredata.AccessReviewCampaign{} - if err := lastCompletedCampaign.LoadLastCompletedByOrganizationID(ctx, conn, e.scope, campaign.OrganizationID); err != nil { + if err := lastCompletedCampaign.LoadLastCompletedByOrganizationID(ctx, tx, e.scope, campaign.OrganizationID); err != nil { if !errors.Is(err, coredata.ErrResourceNotFound) { return fmt.Errorf("cannot load last completed campaign: %w", err) } } else { entries := &coredata.AccessEntries{} - baseline, err = entries.LoadBaselineBySourceID(ctx, conn, e.scope, lastCompletedCampaign.ID, sourceID) + baseline, err = entries.LoadBaselineBySourceID(ctx, tx, e.scope, lastCompletedCampaign.ID, sourceID) if err != nil { return fmt.Errorf("cannot load baseline entries by source: %w", err) } @@ -125,7 +125,7 @@ func (e *ReviewEngine) FetchSource( err = e.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { now := time.Now() seenAccountKeys := make(map[string]struct{}, len(accounts)) @@ -252,7 +252,7 @@ func (e *ReviewEngine) connectorHTTPClient( // connector_id (null = built-in, set = connector-backed). func (e *ReviewEngine) resolveDriver( ctx context.Context, - conn pg.Conn, + tx pg.Tx, source *coredata.AccessSource, ) (drivers.Driver, error) { if source.ConnectorID == nil { @@ -267,7 +267,7 @@ func (e *ReviewEngine) resolveDriver( // Connector-backed: look up the connector and resolve driver by provider dbConnector := &coredata.Connector{} - if err := dbConnector.LoadByID(ctx, conn, e.scope, *source.ConnectorID, e.encryptionKey); err != nil { + if err := dbConnector.LoadByID(ctx, tx, e.scope, *source.ConnectorID, e.encryptionKey); err != nil { return nil, fmt.Errorf("cannot load connector %s: %w", *source.ConnectorID, err) } @@ -291,7 +291,7 @@ func (e *ReviewEngine) resolveDriver( if oauth2Conn, ok := dbConnector.Connection.(*connector.OAuth2Connection); ok { if oauth2Conn.AccessToken != tokenBefore { dbConnector.UpdatedAt = time.Now() - if err := dbConnector.Update(ctx, conn, e.scope, e.encryptionKey); err != nil { + if err := dbConnector.Update(ctx, tx, e.scope, e.encryptionKey); err != nil { return nil, fmt.Errorf("cannot persist refreshed token for connector %s: %w", *source.ConnectorID, err) } } diff --git a/pkg/accessreview/service.go b/pkg/accessreview/service.go index d58370d0e..e125e40ca 100644 --- a/pkg/accessreview/service.go +++ b/pkg/accessreview/service.go @@ -116,7 +116,7 @@ func (s *Service) ResolveEntryOrganizationID(ctx context.Context, entryID gid.GI err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var err error entry := &coredata.AccessEntry{} organizationID, err = entry.LoadOrganizationID(ctx, conn, entryID) diff --git a/pkg/accessreview/source_name_worker.go b/pkg/accessreview/source_name_worker.go index c64051bab..204839a8f 100644 --- a/pkg/accessreview/source_name_worker.go +++ b/pkg/accessreview/source_name_worker.go @@ -83,7 +83,7 @@ func (w *SourceNameWorker) processNext(ctx context.Context) error { err := w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { return source.LoadNextUnsyncedNameForUpdateSkipLocked(ctx, tx) }, ) @@ -101,15 +101,15 @@ func (w *SourceNameWorker) processNext(ctx context.Context) error { resolver drivers.NameResolver ) - err = w.pg.WithConn( + err = w.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { scope := coredata.NewScopeFromObjectID(source.ID) if source.ConnectorID == nil { return fmt.Errorf("source %s has no connector", source.ID) } - if err := dbConnector.LoadByID(ctx, conn, scope, *source.ConnectorID, w.encryptionKey); err != nil { + if err := dbConnector.LoadByID(ctx, tx, scope, *source.ConnectorID, w.encryptionKey); err != nil { return fmt.Errorf("cannot load connector %s: %w", *source.ConnectorID, err) } @@ -126,7 +126,7 @@ func (w *SourceNameWorker) processNext(ctx context.Context) error { if oauth2Conn, ok := dbConnector.Connection.(*connector.OAuth2Connection); ok { if oauth2Conn.AccessToken != tokenBefore { dbConnector.UpdatedAt = time.Now() - if err := dbConnector.Update(ctx, conn, scope, w.encryptionKey); err != nil { + if err := dbConnector.Update(ctx, tx, scope, w.encryptionKey); err != nil { return fmt.Errorf("cannot persist refreshed token for connector %s: %w", *source.ConnectorID, err) } } @@ -192,7 +192,7 @@ func (w *SourceNameWorker) markNameSynced( ) error { return w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { scope := coredata.NewScopeFromObjectID(source.ID) now := time.Now() diff --git a/pkg/accessreview/worker.go b/pkg/accessreview/worker.go index 39b620e6f..79fe23115 100644 --- a/pkg/accessreview/worker.go +++ b/pkg/accessreview/worker.go @@ -127,7 +127,7 @@ func (w *SourceFetchWorker) processNext( if err := w.pg.WithTx( nonCancelableCtx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := sourceFetch.LoadNextQueuedForUpdateSkipLocked(nonCancelableCtx, tx); err != nil { return err // sentinel errors checked by caller } @@ -212,7 +212,7 @@ func (w *SourceFetchWorker) recoverStaleRows(ctx context.Context) { err := w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var fetches coredata.AccessReviewCampaignSourceFetches count, err := fetches.RecoverStale(ctx, tx, staleThreshold, now) if err != nil { @@ -251,10 +251,10 @@ func (w *SourceFetchWorker) commitFailedSourceFetch( sourceFetch.CompletedAt = new(now) sourceFetch.UpdatedAt = now - return w.pg.WithConn( + return w.pg.WithTx( ctx, - func(conn pg.Conn) error { - return sourceFetch.Update(ctx, conn, scope) + func(ctx context.Context, tx pg.Tx) error { + return sourceFetch.Update(ctx, tx, scope) }, ) } @@ -275,10 +275,10 @@ func (w *SourceFetchWorker) commitSuccessfulSourceFetch( sourceFetch.CompletedAt = new(now) sourceFetch.UpdatedAt = now - return w.pg.WithConn( + return w.pg.WithTx( ctx, - func(conn pg.Conn) error { - return sourceFetch.Update(ctx, conn, scope) + func(ctx context.Context, tx pg.Tx) error { + return sourceFetch.Update(ctx, tx, scope) }, ) } @@ -292,7 +292,7 @@ func (w *SourceFetchWorker) finalizeCampaignFetchLifecycle( return w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := lockCampaignForUpdate(ctx, tx, scope, campaignID); err != nil { return fmt.Errorf("cannot lock campaign: %w", err) } diff --git a/pkg/certmanager/acme_challenge_handler.go b/pkg/certmanager/acme_challenge_handler.go index dfdd75358..0602fc7be 100644 --- a/pkg/certmanager/acme_challenge_handler.go +++ b/pkg/certmanager/acme_challenge_handler.go @@ -76,7 +76,7 @@ func (h *ACMEChallengeHandler) getKeyAuthForToken(ctx context.Context, token str err := h.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { domain := &coredata.CustomDomain{} if err := domain.LoadByHTTPChallengeToken(ctx, conn, coredata.NewNoScope(), token); err != nil { return err diff --git a/pkg/certmanager/cache_store.go b/pkg/certmanager/cache_store.go index 46654dae0..1419575d5 100644 --- a/pkg/certmanager/cache_store.go +++ b/pkg/certmanager/cache_store.go @@ -51,7 +51,7 @@ func (w *CacheStore) WarmCache(ctx context.Context) error { err := w.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { domains := coredata.CustomDomains{} if err := domains.LoadActiveCertificates(ctx, conn, coredata.NewNoScope()); err != nil { return fmt.Errorf("cannot load active certificates: %w", err) @@ -93,7 +93,7 @@ func (w *CacheStore) WarmCache(ctx context.Context) error { return nil } -func (w *CacheStore) warmDomain(ctx context.Context, conn pg.Conn, domain *coredata.CustomDomain) error { +func (w *CacheStore) warmDomain(ctx context.Context, conn pg.Querier, domain *coredata.CustomDomain) error { var loadedDomain coredata.CustomDomain if err := loadedDomain.LoadByID(ctx, conn, coredata.NewNoScope(), domain.ID); err != nil { return fmt.Errorf("cannot load domain with decrypted values: %w", err) diff --git a/pkg/certmanager/provisioner.go b/pkg/certmanager/provisioner.go index ec631bdf9..60ba3df42 100644 --- a/pkg/certmanager/provisioner.go +++ b/pkg/certmanager/provisioner.go @@ -189,7 +189,7 @@ func (p *Provisioner) checkCAARecords(domain string) error { func (p *Provisioner) checkPendingDomains(ctx context.Context) error { err := p.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := p.handleStaleProvisioningAttempts(ctx, tx); err != nil { return fmt.Errorf("cannot handle stale provisioning attempts: %w", err) } @@ -203,7 +203,7 @@ func (p *Provisioner) checkPendingDomains(ctx context.Context) error { err = p.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var domains coredata.CustomDomains if err := domains.ListDomainsWithPendingHTTPChallenges(ctx, tx, coredata.NewNoScope()); err != nil { return fmt.Errorf("cannot load domains with pending challenges: %w", err) @@ -243,7 +243,7 @@ func (p *Provisioner) checkPendingDomains(ctx context.Context) error { return nil } -func (p *Provisioner) handleStaleProvisioningAttempts(ctx context.Context, tx pg.Conn) error { +func (p *Provisioner) handleStaleProvisioningAttempts(ctx context.Context, tx pg.Tx) error { var domains coredata.CustomDomains if err := domains.ListStaleProvisioningDomains(ctx, tx, coredata.NewNoScope()); err != nil { return fmt.Errorf("cannot load stale provisioning domains: %w", err) @@ -271,7 +271,7 @@ func (p *Provisioner) handleStaleProvisioningAttempts(ctx context.Context, tx pg func (p *Provisioner) resetStaleDomain( ctx context.Context, - tx pg.Conn, + tx pg.Tx, domain *coredata.CustomDomain, ) error { fullDomain := &coredata.CustomDomain{} @@ -320,7 +320,7 @@ func (p *Provisioner) resetStaleDomain( func (p *Provisioner) provisionDomainCertificate( ctx context.Context, - tx pg.Conn, + tx pg.Tx, domainID gid.GID, ) error { domain := &coredata.CustomDomain{} diff --git a/pkg/certmanager/renewer.go b/pkg/certmanager/renewer.go index 58123d7cf..81278dcd4 100644 --- a/pkg/certmanager/renewer.go +++ b/pkg/certmanager/renewer.go @@ -76,7 +76,7 @@ func (r *Renewer) Run(ctx context.Context) error { func (r *Renewer) checkAndRenew(ctx context.Context) error { return r.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var caches coredata.CachedCertificates cacheCount, err := caches.CountAll(ctx, tx) if err != nil { @@ -128,7 +128,7 @@ func (r *Renewer) checkAndRenew(ctx context.Context) error { ) } -func (r *Renewer) renewDomain(ctx context.Context, tx pg.Conn, domainID gid.GID) error { +func (r *Renewer) renewDomain(ctx context.Context, tx pg.Tx, domainID gid.GID) error { domain := &coredata.CustomDomain{} if err := domain.LoadByIDForUpdateSkipLocked(ctx, tx, coredata.NewNoScope(), domainID); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { diff --git a/pkg/certmanager/selector.go b/pkg/certmanager/selector.go index 82109f316..da8924454 100644 --- a/pkg/certmanager/selector.go +++ b/pkg/certmanager/selector.go @@ -80,7 +80,7 @@ func (s *Selector) loadFromDatabase(domain string) (*tls.Certificate, error) { var cert *tls.Certificate err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var cache coredata.CachedCertificate if err := cache.LoadByDomain(ctx, conn, domain); err != nil { if err := s.rebuildCacheEntry(ctx, conn, domain); err != nil { @@ -114,7 +114,7 @@ func (s *Selector) loadFromDatabase(domain string) (*tls.Certificate, error) { return cert, nil } -func (s *Selector) rebuildCacheEntry(ctx context.Context, conn pg.Conn, domain string) error { +func (s *Selector) rebuildCacheEntry(ctx context.Context, conn pg.Querier, domain string) error { var customDomain coredata.CustomDomain if err := customDomain.LoadByDomain(ctx, conn, coredata.NewNoScope(), domain); err != nil { return fmt.Errorf("cannot load domain: %w", err) diff --git a/pkg/coredata/access_entry.go b/pkg/coredata/access_entry.go index d2213167a..6fb3e3328 100644 --- a/pkg/coredata/access_entry.go +++ b/pkg/coredata/access_entry.go @@ -69,7 +69,7 @@ func (e AccessEntry) CursorKey(orderBy AccessEntryOrderField) page.CursorKey { panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (e *AccessEntry) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (e *AccessEntry) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM access_entries WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -85,7 +85,7 @@ func (e *AccessEntry) AuthorizationAttributes(ctx context.Context, conn pg.Conn) func (e *AccessEntry) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -149,7 +149,7 @@ LIMIT 1; func (e *AccessEntry) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -253,7 +253,7 @@ VALUES ( func (e *AccessEntry) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -298,7 +298,7 @@ WHERE func (entries *AccessEntries) LoadByCampaignID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, campaignID gid.GID, cursor *page.Cursor[AccessEntryOrderField], @@ -364,7 +364,7 @@ WHERE func (entries *AccessEntries) LoadByCampaignIDAndSourceID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, campaignID gid.GID, sourceID gid.GID, @@ -432,7 +432,7 @@ WHERE func (entries *AccessEntries) CountByCampaignID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, campaignID gid.GID, filter *AccessEntryFilter, @@ -461,7 +461,7 @@ WHERE func (entries *AccessEntries) CountByCampaignIDAndSourceID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, campaignID gid.GID, sourceID gid.GID, @@ -492,7 +492,7 @@ WHERE func (entries *AccessEntries) CountPendingByCampaignID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, campaignID gid.GID, ) (int, error) { @@ -519,7 +519,7 @@ WHERE func (e *AccessEntry) LoadOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, entryID gid.GID, ) (gid.GID, error) { q := `SELECT organization_id FROM access_entries WHERE id = $1 LIMIT 1;` @@ -537,7 +537,7 @@ func (e *AccessEntry) LoadOrganizationID( func (e *AccessEntry) UpdateFlags( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -574,7 +574,7 @@ WHERE func (e *AccessEntry) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -698,7 +698,7 @@ type BaselineAccountEntry struct { func (entries *AccessEntries) LoadBaselineBySourceID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, campaignID gid.GID, sourceID gid.GID, @@ -751,7 +751,7 @@ type MembershipAccount struct { func LoadMembershipAccountsByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) ([]MembershipAccount, error) { diff --git a/pkg/coredata/access_entry_decision_history.go b/pkg/coredata/access_entry_decision_history.go index 528202462..7e0305e2a 100644 --- a/pkg/coredata/access_entry_decision_history.go +++ b/pkg/coredata/access_entry_decision_history.go @@ -43,7 +43,7 @@ type ( func (h *AccessEntryDecisionHistory) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -91,7 +91,7 @@ INSERT INTO access_entry_decision_history ( func (h *AccessEntryDecisionHistory) AuthorizationAttributes( ctx context.Context, - conn pg.Conn, + conn pg.Querier, ) (map[string]string, error) { q := `SELECT organization_id FROM access_entry_decision_history WHERE id = $1 LIMIT 1;` @@ -108,7 +108,7 @@ func (h *AccessEntryDecisionHistory) AuthorizationAttributes( func (hs *AccessEntryDecisionHistories) LoadByEntryID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, entryID gid.GID, ) error { diff --git a/pkg/coredata/access_entry_statistics.go b/pkg/coredata/access_entry_statistics.go index 5f3075b61..76178ee9e 100644 --- a/pkg/coredata/access_entry_statistics.go +++ b/pkg/coredata/access_entry_statistics.go @@ -33,7 +33,7 @@ type AccessEntryStatistics struct { func (s *AccessEntryStatistics) LoadByCampaignID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, campaignID gid.GID, ) error { @@ -135,7 +135,7 @@ GROUP BY incremental_tag; func (s *AccessEntryStatistics) LoadByCampaignIDAndSourceID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, campaignID gid.GID, sourceID gid.GID, diff --git a/pkg/coredata/access_review_campaign.go b/pkg/coredata/access_review_campaign.go index 0d8db056e..d68def4a7 100644 --- a/pkg/coredata/access_review_campaign.go +++ b/pkg/coredata/access_review_campaign.go @@ -53,7 +53,7 @@ func (c AccessReviewCampaign) CursorKey(orderBy AccessReviewCampaignOrderField) panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (c *AccessReviewCampaign) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (c *AccessReviewCampaign) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM access_review_campaigns WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -69,7 +69,7 @@ func (c *AccessReviewCampaign) AuthorizationAttributes(ctx context.Context, conn func (c *AccessReviewCampaign) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -117,7 +117,7 @@ LIMIT 1; func (c *AccessReviewCampaign) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -173,7 +173,7 @@ VALUES ( func (c *AccessReviewCampaign) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -218,7 +218,7 @@ WHERE func (c *AccessReviewCampaign) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -244,7 +244,7 @@ WHERE %s AND id = @id func (campaigns *AccessReviewCampaigns) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[AccessReviewCampaignOrderField], @@ -291,7 +291,7 @@ WHERE func (campaigns *AccessReviewCampaigns) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -317,7 +317,7 @@ WHERE func (c *AccessReviewCampaign) LoadLastCompletedByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) error { diff --git a/pkg/coredata/access_review_campaign_scope_system.go b/pkg/coredata/access_review_campaign_scope_system.go index bfe1c4913..6fce5c3d7 100644 --- a/pkg/coredata/access_review_campaign_scope_system.go +++ b/pkg/coredata/access_review_campaign_scope_system.go @@ -33,7 +33,7 @@ type AccessReviewCampaignScopeSystem struct { func (ss AccessReviewCampaignScopeSystem) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -56,7 +56,7 @@ VALUES (@access_review_campaign_id, @access_source_id, @tenant_id) func (ss AccessReviewCampaignScopeSystem) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -80,7 +80,7 @@ ON CONFLICT (access_review_campaign_id, access_source_id) DO NOTHING func (ss AccessReviewCampaignScopeSystem) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -108,7 +108,7 @@ WHERE func (c *AccessReviewCampaign) LockForUpdate( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -135,7 +135,7 @@ FOR UPDATE func (f *AccessReviewCampaignSourceFetch) UpsertQueued( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, now time.Time, ) error { @@ -184,7 +184,7 @@ ON CONFLICT (access_review_campaign_id, access_source_id) DO UPDATE SET // all stale fetches regardless of tenant. func (fs *AccessReviewCampaignSourceFetches) RecoverStale( ctx context.Context, - conn pg.Conn, + conn pg.Querier, staleThreshold time.Time, now time.Time, ) (int64, error) { diff --git a/pkg/coredata/access_review_campaign_source_fetch.go b/pkg/coredata/access_review_campaign_source_fetch.go index 8b929517e..f0c2fb1f4 100644 --- a/pkg/coredata/access_review_campaign_source_fetch.go +++ b/pkg/coredata/access_review_campaign_source_fetch.go @@ -54,7 +54,7 @@ var ( func (f *AccessReviewCampaignSourceFetch) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -107,7 +107,7 @@ INSERT INTO access_review_campaign_source_fetches ( func (f *AccessReviewCampaignSourceFetch) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -154,7 +154,7 @@ WHERE func (f *AccessReviewCampaignSourceFetch) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, campaignID gid.GID, sourceID gid.GID, @@ -207,7 +207,7 @@ LIMIT 1 func (fs *AccessReviewCampaignSourceFetches) LoadByCampaignID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, campaignID gid.GID, ) error { @@ -258,7 +258,7 @@ ORDER BY created_at ASC // Scope for subsequent operations. func (f *AccessReviewCampaignSourceFetch) LoadNextQueuedForUpdateSkipLocked( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT diff --git a/pkg/coredata/access_source.go b/pkg/coredata/access_source.go index 26f946c18..01b8cf1fa 100644 --- a/pkg/coredata/access_source.go +++ b/pkg/coredata/access_source.go @@ -52,7 +52,7 @@ func (as AccessSource) CursorKey(orderBy AccessSourceOrderField) page.CursorKey panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (as *AccessSource) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (as *AccessSource) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM access_sources WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -68,7 +68,7 @@ func (as *AccessSource) AuthorizationAttributes(ctx context.Context, conn pg.Con func (as *AccessSource) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -115,7 +115,7 @@ LIMIT 1; func (as *AccessSource) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -168,7 +168,7 @@ VALUES ( func (as *AccessSource) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -211,7 +211,7 @@ WHERE func (as *AccessSource) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -237,7 +237,7 @@ WHERE %s AND id = @id func (sources *AccessSources) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[AccessSourceOrderField], @@ -283,7 +283,7 @@ WHERE func (sources *AccessSources) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -311,7 +311,7 @@ WHERE // name order. Only explicitly scoped sources are returned. func (sources *AccessSources) LoadScopeSourcesByCampaignID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, campaignID gid.GID, ) error { @@ -366,7 +366,7 @@ var ErrNoAccessSourceNameSyncAvailable = fmt.Errorf("no access source name sync // FOR UPDATE SKIP LOCKED so concurrent workers do not pick the same row. func (as *AccessSource) LoadNextUnsyncedNameForUpdateSkipLocked( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT diff --git a/pkg/coredata/applicability_statement.go b/pkg/coredata/applicability_statement.go index 78998b1dd..628e1dc71 100644 --- a/pkg/coredata/applicability_statement.go +++ b/pkg/coredata/applicability_statement.go @@ -58,7 +58,7 @@ func (s ApplicabilityStatement) CursorKey(orderBy ApplicabilityStatementOrderFie panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (s *ApplicabilityStatement) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (s *ApplicabilityStatement) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM applicability_statements WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -74,7 +74,7 @@ func (s *ApplicabilityStatement) AuthorizationAttributes(ctx context.Context, co func (sac *ApplicabilityStatement) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -144,7 +144,7 @@ LIMIT 1; func (sac *ApplicabilityStatement) LoadByStateOfApplicabilityIDAndControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, stateOfApplicabilityID gid.GID, controlID gid.GID, @@ -208,7 +208,7 @@ LIMIT 1; func (sac *ApplicabilityStatement) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -269,7 +269,7 @@ VALUES ( func (sac *ApplicabilityStatement) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -304,7 +304,7 @@ WHERE func (sac *ApplicabilityStatement) UpdateByID( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -341,7 +341,7 @@ WHERE func (sac *ApplicabilityStatement) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -371,7 +371,7 @@ WHERE state_of_applicability_id IN (SELECT id FROM current_soa) func (sac *ApplicabilityStatement) DeleteByID( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, applicabilityStatementID gid.GID, ) error { @@ -400,7 +400,7 @@ WHERE func (sacs *ApplicabilityStatements) LoadByStateOfApplicabilityID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, stateOfApplicabilityID gid.GID, cursor *page.Cursor[ApplicabilityStatementOrderField], @@ -469,7 +469,7 @@ WHERE func (sacs *ApplicabilityStatements) CountByStateOfApplicabilityID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, stateOfApplicabilityID gid.GID, ) (int, error) { @@ -497,7 +497,7 @@ WHERE func (sacs *ApplicabilityStatements) LoadByControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, cursor *page.Cursor[ApplicabilityStatementOrderField], diff --git a/pkg/coredata/asset.go b/pkg/coredata/asset.go index beaff7047..05bc5f642 100644 --- a/pkg/coredata/asset.go +++ b/pkg/coredata/asset.go @@ -57,7 +57,7 @@ func (a *Asset) CursorKey(field AssetOrderField) page.CursorKey { } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (a *Asset) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (a *Asset) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM assets WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -73,7 +73,7 @@ func (a *Asset) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[ func (a *Asset) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, assetID gid.GID, ) error { @@ -124,7 +124,7 @@ LIMIT 1; func (a *Asset) LoadByOwnerID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -174,7 +174,7 @@ LIMIT 1; func (a *Assets) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *AssetFilter, @@ -208,7 +208,7 @@ WHERE func (a *Assets) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[AssetOrderField], @@ -260,7 +260,7 @@ WHERE func (a *Asset) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -312,7 +312,7 @@ INSERT INTO assets ( func (a *Asset) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -372,7 +372,7 @@ RETURNING func (a *Asset) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -396,7 +396,7 @@ WHERE return nil } -func (assets Assets) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error { +func (assets Assets) Snapshot(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error { snapshotters := []AssetSnapshotter{Assets{}, Vendors{}, AssetVendors{}} for _, snapshotter := range snapshotters { @@ -410,7 +410,7 @@ func (assets Assets) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, o func (assets Assets) InsertAssetSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/asset_vendor.go b/pkg/coredata/asset_vendor.go index a918643f4..47d647532 100644 --- a/pkg/coredata/asset_vendor.go +++ b/pkg/coredata/asset_vendor.go @@ -37,13 +37,13 @@ type ( AssetVendors []*AssetVendor AssetSnapshotter interface { - InsertAssetSnapshots(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error + InsertAssetSnapshots(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error } ) func (av AssetVendors) Merge( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, assetID gid.GID, organizationID gid.GID, @@ -89,7 +89,7 @@ WHEN NOT MATCHED func (av AssetVendors) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, assetID gid.GID, organizationID gid.GID, @@ -127,7 +127,7 @@ FROM vendor_ids func (av AssetVendors) InsertAssetSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/audit.go b/pkg/coredata/audit.go index 7083ec3ee..843789410 100644 --- a/pkg/coredata/audit.go +++ b/pkg/coredata/audit.go @@ -61,7 +61,7 @@ func (a *Audit) CursorKey(field AuditOrderField) page.CursorKey { } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (a *Audit) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (a *Audit) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM audits WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -77,7 +77,7 @@ func (a *Audit) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[ func (a *Audit) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, auditID gid.GID, ) error { @@ -128,7 +128,7 @@ LIMIT 1; func (a *Audits) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -160,7 +160,7 @@ WHERE func (a *Audits) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[AuditOrderField], @@ -212,7 +212,7 @@ WHERE func (a *Audits) LoadAllByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *AuditFilter, @@ -262,7 +262,7 @@ ORDER BY valid_from DESC func (a *Audit) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -320,7 +320,7 @@ INSERT INTO audits ( func (a *Audit) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -362,7 +362,7 @@ WHERE func (a *Audit) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -387,7 +387,7 @@ WHERE func (a *Audits) LoadByControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, cursor *page.Cursor[AuditOrderField], @@ -454,7 +454,7 @@ WHERE %s func (a *Audits) LoadByFindingID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, findingID gid.GID, cursor *page.Cursor[AuditOrderField], @@ -521,7 +521,7 @@ WHERE %s func (a *Audits) CountByControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, ) (int, error) { @@ -563,7 +563,7 @@ WHERE func (a *Audits) CountByFindingID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, findingID gid.GID, ) (int, error) { @@ -605,7 +605,7 @@ WHERE func (a *Audit) LoadByReportID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, reportID gid.GID, ) error { diff --git a/pkg/coredata/audit_log_entry.go b/pkg/coredata/audit_log_entry.go index 3277151cd..1118175e2 100644 --- a/pkg/coredata/audit_log_entry.go +++ b/pkg/coredata/audit_log_entry.go @@ -53,7 +53,7 @@ func (e AuditLogEntry) CursorKey(orderBy AuditLogEntryOrderField) page.CursorKey panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (e *AuditLogEntry) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (e *AuditLogEntry) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM audit_log_entries WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -69,7 +69,7 @@ func (e *AuditLogEntry) AuthorizationAttributes(ctx context.Context, conn pg.Con func (e *AuditLogEntry) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -122,7 +122,7 @@ VALUES ( func (e *AuditLogEntry) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -168,7 +168,7 @@ LIMIT 1; func (es *AuditLogEntries) LoadAllByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[AuditLogEntryOrderField], @@ -216,7 +216,7 @@ WHERE func (es *AuditLogEntries) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *AuditLogEntryFilter, diff --git a/pkg/coredata/cached_certificate.go b/pkg/coredata/cached_certificate.go index 752478f6f..24cd40919 100644 --- a/pkg/coredata/cached_certificate.go +++ b/pkg/coredata/cached_certificate.go @@ -39,7 +39,7 @@ type ( CachedCertificates []*CachedCertificate ) -func (cc *CachedCertificate) LoadByDomain(ctx context.Context, conn pg.Conn, domain string) error { +func (cc *CachedCertificate) LoadByDomain(ctx context.Context, conn pg.Querier, domain string) error { q := ` SELECT domain, @@ -72,7 +72,7 @@ LIMIT 1 return nil } -func (cc *CachedCertificate) Upsert(ctx context.Context, conn pg.Conn) error { +func (cc *CachedCertificate) Upsert(ctx context.Context, conn pg.Querier) error { cc.CachedAt = time.Now() q := ` @@ -120,7 +120,7 @@ ON CONFLICT (domain) DO UPDATE SET return nil } -func (cc *CachedCertificate) Delete(ctx context.Context, conn pg.Conn, domain string) error { +func (cc *CachedCertificate) Delete(ctx context.Context, conn pg.Tx, domain string) error { q := `DELETE FROM cached_certificates WHERE domain = @domain` args := pgx.NamedArgs{"domain": domain} @@ -132,7 +132,7 @@ func (cc *CachedCertificate) Delete(ctx context.Context, conn pg.Conn, domain st return nil } -func (cc *CachedCertificates) CountAll(ctx context.Context, conn pg.Conn) (int, error) { +func (cc *CachedCertificates) CountAll(ctx context.Context, conn pg.Querier) (int, error) { q := `SELECT COUNT(*) FROM cached_certificates` var count int @@ -144,7 +144,7 @@ func (cc *CachedCertificates) CountAll(ctx context.Context, conn pg.Conn) (int, return count, nil } -func (cc *CachedCertificates) CleanExpired(ctx context.Context, conn pg.Conn) error { +func (cc *CachedCertificates) CleanExpired(ctx context.Context, conn pg.Querier) error { q := ` DELETE FROM @@ -161,7 +161,7 @@ WHERE return nil } -func (cc *CachedCertificate) RefreshFromDomain(ctx context.Context, conn pg.Conn, domain *CustomDomain, encryptionKey cipher.EncryptionKey) error { +func (cc *CachedCertificate) RefreshFromDomain(ctx context.Context, conn pg.Querier, domain *CustomDomain, encryptionKey cipher.EncryptionKey) error { if domain.SSLCertificate == nil { return fmt.Errorf("domain has no parsed certificate") } diff --git a/pkg/coredata/compliance_external_url.go b/pkg/coredata/compliance_external_url.go index eb663023d..3753e3079 100644 --- a/pkg/coredata/compliance_external_url.go +++ b/pkg/coredata/compliance_external_url.go @@ -52,7 +52,7 @@ func (c ComplianceExternalURL) CursorKey(orderBy ComplianceExternalURLOrderField panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (c *ComplianceExternalURL) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (c *ComplianceExternalURL) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM compliance_external_urls WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -68,7 +68,7 @@ func (c *ComplianceExternalURL) AuthorizationAttributes(ctx context.Context, con func (c *ComplianceExternalURL) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -114,7 +114,7 @@ LIMIT 1; func (c *ComplianceExternalURL) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -164,7 +164,7 @@ RETURNING rank; func (c *ComplianceExternalURL) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -197,7 +197,7 @@ WHERE func (c *ComplianceExternalURL) UpdateRank( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -248,7 +248,7 @@ WHERE %s func (c *ComplianceExternalURL) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -273,7 +273,7 @@ WHERE func (c *ComplianceExternalURLs) LoadByTrustCenterID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterID gid.GID, cursor *page.Cursor[ComplianceExternalURLOrderField], diff --git a/pkg/coredata/compliance_framework.go b/pkg/coredata/compliance_framework.go index b3db996bb..b7b479b4d 100644 --- a/pkg/coredata/compliance_framework.go +++ b/pkg/coredata/compliance_framework.go @@ -55,7 +55,7 @@ func (c ComplianceFramework) CursorKey(orderBy ComplianceFrameworkOrderField) pa panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (c *ComplianceFramework) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (c *ComplianceFramework) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM compliance_frameworks WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -71,7 +71,7 @@ func (c *ComplianceFramework) AuthorizationAttributes(ctx context.Context, conn func (c *ComplianceFramework) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, complianceFrameworkID gid.GID, ) error { @@ -117,7 +117,7 @@ LIMIT 1; func (c *ComplianceFramework) LoadByTrustCenterIDAndFrameworkID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterID gid.GID, frameworkID gid.GID, @@ -168,7 +168,7 @@ LIMIT 1; func (c *ComplianceFramework) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -222,7 +222,7 @@ RETURNING rank; func (c *ComplianceFramework) UpdateRank( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -272,7 +272,7 @@ WHERE %s func (c *ComplianceFramework) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -297,7 +297,7 @@ WHERE func (c *ComplianceFrameworks) LoadByTrustCenterID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterID gid.GID, cursor *page.Cursor[ComplianceFrameworkOrderField], @@ -342,7 +342,7 @@ WHERE func (c *ComplianceFrameworks) LoadWithHiddenByTrustCenterID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterID gid.GID, cursor *page.Cursor[ComplianceFrameworkOrderField], diff --git a/pkg/coredata/connector.go b/pkg/coredata/connector.go index 4465409a2..7d83c63c7 100644 --- a/pkg/coredata/connector.go +++ b/pkg/coredata/connector.go @@ -82,7 +82,7 @@ func (c *Connector) CursorKey(orderBy ConnectorOrderField) page.CursorKey { } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (c *Connector) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (c *Connector) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM connectors WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -98,7 +98,7 @@ func (c *Connector) AuthorizationAttributes(ctx context.Context, conn pg.Conn) ( func (c *Connectors) LoadAllByOrganizationIDProtocolAndProvider( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, protocol ConnectorProtocol, @@ -118,7 +118,7 @@ func (c *Connectors) LoadAllByOrganizationIDProtocolAndProvider( func (c *Connectors) LoadByOrganizationIDWithoutDecryptedConnection( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[ConnectorOrderField], @@ -129,7 +129,7 @@ func (c *Connectors) LoadByOrganizationIDWithoutDecryptedConnection( func (c *Connectors) LoadAllByOrganizationIDWithoutDecryptedConnection( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) error { @@ -138,7 +138,7 @@ func (c *Connectors) LoadAllByOrganizationIDWithoutDecryptedConnection( func (c *Connector) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, connectorID gid.GID, encryptionKey cipher.EncryptionKey, @@ -175,7 +175,7 @@ func (c *Connector) LoadByID( // Use this when you only need provider, organization, or other metadata. func (c *Connector) LoadMetadataByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, connectorID gid.GID, ) error { @@ -222,7 +222,7 @@ LIMIT 1; func (c *Connector) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -248,7 +248,7 @@ WHERE %s AND id = @id func (c *Connector) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, encryptionKey cipher.EncryptionKey, ) error { @@ -328,7 +328,7 @@ INSERT INTO connectors ( func (c *Connectors) loadByOrganizationIDWithPagination( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[ConnectorOrderField], @@ -377,7 +377,7 @@ WHERE func (c *Connectors) loadAllByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) error { @@ -422,7 +422,7 @@ ORDER BY func (c *Connectors) loadAllByOrganizationIDProtocolAndProvider( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, protocol ConnectorProtocol, @@ -475,7 +475,7 @@ ORDER BY func (c *Connector) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, encryptionKey cipher.EncryptionKey, ) error { diff --git a/pkg/coredata/control.go b/pkg/coredata/control.go index 59de94b94..2fb0d67f0 100644 --- a/pkg/coredata/control.go +++ b/pkg/coredata/control.go @@ -58,7 +58,7 @@ func (c Control) CursorKey(orderBy ControlOrderField) page.CursorKey { } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (c *Control) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (c *Control) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM controls WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -74,7 +74,7 @@ func (c *Control) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (ma func (c *Controls) CountByDocumentID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, filter *ControlFilter, @@ -116,7 +116,7 @@ WHERE %s func (c *Controls) LoadByDocumentID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, cursor *page.Cursor[ControlOrderField], @@ -187,7 +187,7 @@ WHERE %s func (c *Controls) CountByMeasureID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, measureID gid.GID, filter *ControlFilter, @@ -229,7 +229,7 @@ WHERE %s func (c *Controls) LoadByMeasureID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, measureID gid.GID, cursor *page.Cursor[ControlOrderField], @@ -300,7 +300,7 @@ WHERE %s func (c *Controls) CountByRiskID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, riskID gid.GID, filter *ControlFilter, @@ -348,7 +348,7 @@ WHERE %s func (c *Controls) LoadByRiskID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, riskID gid.GID, cursor *page.Cursor[ControlOrderField], @@ -425,7 +425,7 @@ WHERE %s func (c *Controls) CountByFrameworkID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, frameworkID gid.GID, filter *ControlFilter, @@ -457,7 +457,7 @@ WHERE %s func (c *Controls) LoadByFrameworkID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, frameworkID gid.GID, cursor *page.Cursor[ControlOrderField], @@ -508,7 +508,7 @@ WHERE func (c *Controls) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *ControlFilter, @@ -551,7 +551,7 @@ WHERE %s func (c *Controls) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[ControlOrderField], @@ -622,7 +622,7 @@ WHERE %s func (c *Control) LoadByFrameworkIDAndSectionTitle( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, frameworkID gid.GID, sectionTitle string, @@ -673,7 +673,7 @@ LIMIT 1; func (c *Control) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, ) error { @@ -722,7 +722,7 @@ LIMIT 1; func (c *Controls) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlIDs []gid.GID, ) error { @@ -767,7 +767,7 @@ WHERE func (c Control) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -833,7 +833,7 @@ VALUES ( func (c Control) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -855,7 +855,7 @@ WHERE func (c *Control) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -901,7 +901,7 @@ WHERE %s func (c *Controls) LoadByAuditID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, auditID gid.GID, cursor *page.Cursor[ControlOrderField], @@ -972,7 +972,7 @@ WHERE %s func (c *Controls) LoadBySnapshotID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, snapshotID gid.GID, cursor *page.Cursor[ControlOrderField], @@ -1043,7 +1043,7 @@ WHERE %s func (c *Controls) CountByStateOfApplicabilityID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, stateOfApplicabilityID gid.GID, filter *ControlFilter, diff --git a/pkg/coredata/control_audit.go b/pkg/coredata/control_audit.go index 1d07f6652..51a55eeaa 100644 --- a/pkg/coredata/control_audit.go +++ b/pkg/coredata/control_audit.go @@ -38,7 +38,7 @@ type ( func (ca ControlAudit) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -73,7 +73,7 @@ ON CONFLICT (control_id, audit_id) DO NOTHING; func (ca ControlAudit) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, controlID gid.GID, auditID gid.GID, diff --git a/pkg/coredata/control_document.go b/pkg/coredata/control_document.go index a330bc99f..9967ce399 100644 --- a/pkg/coredata/control_document.go +++ b/pkg/coredata/control_document.go @@ -41,7 +41,7 @@ type ( func (cp ControlDocument) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -87,7 +87,7 @@ VALUES ( func (cp ControlDocument) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, controlID gid.GID, documentID gid.GID, @@ -116,7 +116,7 @@ WHERE func (cp ControlDocument) DeleteByDocumentIDs( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, documentIDs []gid.GID, ) error { diff --git a/pkg/coredata/control_mesure.go b/pkg/coredata/control_mesure.go index 31a2daa5e..ad3550767 100644 --- a/pkg/coredata/control_mesure.go +++ b/pkg/coredata/control_mesure.go @@ -39,7 +39,7 @@ type ( func (cm ControlMeasure) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -74,7 +74,7 @@ ON CONFLICT (control_id, measure_id) DO NOTHING; func (cm ControlMeasure) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, controlID gid.GID, measureID gid.GID, @@ -108,7 +108,7 @@ type ControlsWithRisk []*ControlWithRisk func (cwrs *ControlsWithRisk) LoadByControlIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlIDs []gid.GID, ) error { diff --git a/pkg/coredata/control_obligation.go b/pkg/coredata/control_obligation.go index 10c2e791b..b252eb77d 100644 --- a/pkg/coredata/control_obligation.go +++ b/pkg/coredata/control_obligation.go @@ -37,7 +37,7 @@ type ( func (co ControlObligation) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -69,7 +69,7 @@ ON CONFLICT (control_id, obligation_id) DO NOTHING; func (co ControlObligation) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, controlID gid.GID, obligationID gid.GID, @@ -97,7 +97,7 @@ WHERE func (cos *ControlObligations) CountByControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, filter *ControlObligationFilter, diff --git a/pkg/coredata/control_snapshot.go b/pkg/coredata/control_snapshot.go index 17c3539c9..038be002a 100644 --- a/pkg/coredata/control_snapshot.go +++ b/pkg/coredata/control_snapshot.go @@ -38,7 +38,7 @@ type ( func (cs ControlSnapshot) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -73,7 +73,7 @@ ON CONFLICT (control_id, snapshot_id) DO NOTHING; func (cs ControlSnapshot) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, controlID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/custom_domain.go b/pkg/coredata/custom_domain.go index 0c574e24c..c8b20c9ac 100644 --- a/pkg/coredata/custom_domain.go +++ b/pkg/coredata/custom_domain.go @@ -66,7 +66,7 @@ func NewCustomDomain(tenantID gid.TenantID, domain string) *CustomDomain { } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (cd *CustomDomain) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (cd *CustomDomain) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM custom_domains WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -151,7 +151,7 @@ func (cd *CustomDomain) ParseCertificate(encryptionKey cipher.EncryptionKey) err func (cd *CustomDomain) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, domainID gid.GID, ) error { @@ -207,7 +207,7 @@ LIMIT 1 func (cd *CustomDomain) LoadByIDForUpdateSkipLocked( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, domainID gid.GID, ) error { @@ -263,7 +263,7 @@ FOR UPDATE SKIP LOCKED func (cd *CustomDomain) LoadByDomain( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, domain string, ) error { @@ -319,7 +319,7 @@ LIMIT 1 func (cd *CustomDomain) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) error { @@ -375,7 +375,7 @@ LIMIT 1 func (cd *CustomDomain) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, encryptionKey cipher.EncryptionKey, ) error { @@ -462,7 +462,7 @@ INSERT INTO custom_domains ( func (cd *CustomDomain) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { var encryptedKey []byte @@ -522,7 +522,7 @@ WHERE func (cd *CustomDomain) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -547,7 +547,7 @@ WHERE func (cd *CustomDomain) LoadByHTTPChallengeToken( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, token string, ) error { @@ -599,7 +599,7 @@ LIMIT 1 func (domains *CustomDomains) ListDomainsForRenewal( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -651,7 +651,7 @@ ORDER BY func (domains *CustomDomains) ListDomainsWithPendingHTTPChallenges( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -706,7 +706,7 @@ WHERE func (domains *CustomDomains) LoadActiveCertificates( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -756,7 +756,7 @@ WHERE func (domains *CustomDomains) ListStaleProvisioningDomains( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/data_protection_impact_assessment.go b/pkg/coredata/data_protection_impact_assessment.go index 511af00ad..ca554e392 100644 --- a/pkg/coredata/data_protection_impact_assessment.go +++ b/pkg/coredata/data_protection_impact_assessment.go @@ -57,7 +57,7 @@ func (dpia *DataProtectionImpactAssessment) CursorKey(field DataProtectionImpact } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (dpia *DataProtectionImpactAssessment) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (dpia *DataProtectionImpactAssessment) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM processing_activity_data_protection_impact_assessments WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -73,7 +73,7 @@ func (dpia *DataProtectionImpactAssessment) AuthorizationAttributes(ctx context. func (dpias *DataProtectionImpactAssessments) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *DataProtectionImpactAssessmentFilter, @@ -108,7 +108,7 @@ WHERE func (dpias *DataProtectionImpactAssessments) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[DataProtectionImpactAssessmentOrderField], @@ -161,7 +161,7 @@ WHERE func (dpias *DataProtectionImpactAssessments) LoadAllByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *DataProtectionImpactAssessmentFilter, @@ -211,7 +211,7 @@ WHERE func (dpia *DataProtectionImpactAssessment) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, dpiaID gid.GID, ) error { @@ -263,7 +263,7 @@ LIMIT 1; func (dpia *DataProtectionImpactAssessment) LoadByProcessingActivityID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, processingActivityID gid.GID, ) error { @@ -315,7 +315,7 @@ LIMIT 1; func (dpia *DataProtectionImpactAssessment) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -377,7 +377,7 @@ INSERT INTO processing_activity_data_protection_impact_assessments ( func (dpia *DataProtectionImpactAssessment) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -416,7 +416,7 @@ WHERE func (dpia *DataProtectionImpactAssessment) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -441,7 +441,7 @@ WHERE func (dpias DataProtectionImpactAssessments) InsertProcessingActivitySnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/datum.go b/pkg/coredata/datum.go index 05a6dc3e8..f2364c00c 100644 --- a/pkg/coredata/datum.go +++ b/pkg/coredata/datum.go @@ -43,7 +43,7 @@ type ( Data []*Datum DataSnapshotter interface { - InsertDataSnapshots(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error + InsertDataSnapshots(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error } ) @@ -61,7 +61,7 @@ func (d *Datum) CursorKey(field DatumOrderField) page.CursorKey { } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (d *Datum) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (d *Datum) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM data WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -77,7 +77,7 @@ func (d *Datum) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[ func (d *Datum) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, dataID gid.GID, ) error { @@ -122,7 +122,7 @@ LIMIT 1; func (d *Datum) LoadByOwnerID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -166,7 +166,7 @@ LIMIT 1; func (d *Data) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *DatumFilter, @@ -201,7 +201,7 @@ WHERE func (d *Data) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[DatumOrderField], @@ -251,7 +251,7 @@ WHERE func (d *Datum) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -303,7 +303,7 @@ INSERT INTO data ( func (d *Datum) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -357,7 +357,7 @@ RETURNING func (d *Datum) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -381,7 +381,7 @@ WHERE return nil } -func (d Data) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error { +func (d Data) Snapshot(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error { snapshotters := []DataSnapshotter{Data{}, Vendors{}, DatumVendors{}} for _, snapshotter := range snapshotters { @@ -395,7 +395,7 @@ func (d Data) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organiza func (d Data) InsertDataSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/datum_vendor.go b/pkg/coredata/datum_vendor.go index 8968cfe11..809733472 100644 --- a/pkg/coredata/datum_vendor.go +++ b/pkg/coredata/datum_vendor.go @@ -38,7 +38,7 @@ type ( func (dv DatumVendors) Merge( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, datumID gid.GID, organizationID gid.GID, @@ -84,7 +84,7 @@ WHEN NOT MATCHED BY SOURCE func (dv DatumVendors) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, datumID gid.GID, organizationID gid.GID, @@ -122,7 +122,7 @@ FROM vendor_ids func (d DatumVendors) InsertDataSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/document.go b/pkg/coredata/document.go index 1f98755f1..c0988681e 100644 --- a/pkg/coredata/document.go +++ b/pkg/coredata/document.go @@ -62,7 +62,7 @@ func (p Document) CursorKey(orderBy DocumentOrderField) page.CursorKey { } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (d *Document) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (d *Document) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := ` WITH document AS ( SELECT id, organization_id, status @@ -119,7 +119,7 @@ LEFT JOIN last_quorum lq ON lq.document_id = document.id; func (p *Document) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, ) error { @@ -177,7 +177,7 @@ LIMIT 1; func (p *Document) LoadByIDWithFilter( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, filter *DocumentFilter, @@ -238,7 +238,7 @@ LIMIT 1; func (p *Documents) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentIDs []gid.GID, ) error { @@ -291,7 +291,7 @@ WHERE func (p *Documents) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *DocumentFilter, @@ -325,7 +325,7 @@ WHERE func (p *Documents) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[DocumentOrderField], @@ -384,7 +384,7 @@ WHERE func (p *Documents) LoadAllByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *DocumentFilter, @@ -441,7 +441,7 @@ ORDER BY title ASC func (p *Documents) LoadPublishedByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[DocumentOrderField], @@ -511,7 +511,7 @@ WHERE func (p Document) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -563,7 +563,7 @@ VALUES ( func (p Document) SoftDelete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -581,7 +581,7 @@ UPDATE documents SET deleted_at = @deleted_at WHERE %s AND id = @document_id func (p Document) DeleteByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, ) error { @@ -600,7 +600,7 @@ DELETE FROM documents WHERE %s AND organization_id = @organization_id func (p *Document) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -643,7 +643,7 @@ WHERE func (p *Documents) CountByControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, filter *DocumentFilter, @@ -679,7 +679,7 @@ WHERE cp.control_id = @control_id func (p *Documents) LoadByControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, cursor *page.Cursor[DocumentOrderField], @@ -740,7 +740,7 @@ WHERE cp.control_id = @control_id func (p *Documents) CountByRiskID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, riskID gid.GID, filter *DocumentFilter, @@ -776,7 +776,7 @@ WHERE rp.risk_id = @risk_id func (p *Documents) LoadByRiskID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, riskID gid.GID, cursor *page.Cursor[DocumentOrderField], @@ -837,7 +837,7 @@ WHERE rp.risk_id = @risk_id func (p *Documents) BulkSoftDelete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -861,7 +861,7 @@ UPDATE documents SET deleted_at = @deleted_at WHERE %s AND id = ANY(@document_id func (p *Documents) BulkArchive( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -888,7 +888,7 @@ UPDATE documents SET status = 'ARCHIVED', archived_at = @archived_at, trust_cent func (p *Documents) BulkUnarchive( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -914,7 +914,7 @@ UPDATE documents SET status = 'ACTIVE', archived_at = NULL WHERE %s AND id = ANY func (p *Document) IsLastSignableVersionSignedByUserEmail( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, userEmail mail.Addr, @@ -975,7 +975,7 @@ SELECT EXISTS ( func (p *Document) GetViewerApprovalStateForLastVersion( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, identityID gid.GID, diff --git a/pkg/coredata/document_version.go b/pkg/coredata/document_version.go index ac5103321..4d896d9e2 100644 --- a/pkg/coredata/document_version.go +++ b/pkg/coredata/document_version.go @@ -50,7 +50,7 @@ type ( ) // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (dv *DocumentVersion) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (dv *DocumentVersion) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := ` WITH document_version AS ( SELECT id, document_id, organization_id, status AS version_status @@ -106,7 +106,7 @@ LEFT JOIN last_quorum lq ON lq.version_id = document_version.id; func (dv *DocumentVersions) LoadByDocumentID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, cursor *page.Cursor[DocumentVersionOrderField], @@ -171,7 +171,7 @@ func (dv DocumentVersion) CursorKey(orderBy DocumentVersionOrderField) page.Curs func (dv *DocumentVersion) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentVersionID gid.GID, ) error { @@ -223,7 +223,7 @@ LIMIT 1; func (dv DocumentVersion) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -295,7 +295,7 @@ VALUES ( func (dv *DocumentVersion) LoadByDocumentIDAndVersion( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, major int, @@ -353,7 +353,7 @@ LIMIT 1; func (dv *DocumentVersion) LoadLatestVersion( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, ) error { @@ -405,7 +405,7 @@ LIMIT 1; func (dv *DocumentVersion) LoadLatestPublishedVersion( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, ) error { @@ -459,7 +459,7 @@ LIMIT 1; func (dv DocumentVersion) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -505,7 +505,7 @@ WHERE %s func (dv DocumentVersion) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -531,7 +531,7 @@ WHERE %s func (dv *DocumentVersions) CountByDocumentID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, filter *DocumentVersionFilter, diff --git a/pkg/coredata/document_version_approval_decision.go b/pkg/coredata/document_version_approval_decision.go index a0130a382..908113b86 100644 --- a/pkg/coredata/document_version_approval_decision.go +++ b/pkg/coredata/document_version_approval_decision.go @@ -54,7 +54,7 @@ func (d DocumentVersionApprovalDecision) CursorKey(orderBy DocumentVersionApprov panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (d *DocumentVersionApprovalDecision) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (d *DocumentVersionApprovalDecision) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM document_version_approval_decisions WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -70,7 +70,7 @@ func (d *DocumentVersionApprovalDecision) AuthorizationAttributes(ctx context.Co func (d *DocumentVersionApprovalDecision) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -118,7 +118,7 @@ WHERE func (d *DocumentVersionApprovalDecision) LoadByQuorumIDAndApproverID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, quorumID gid.GID, approverID gid.GID, @@ -172,7 +172,7 @@ LIMIT 1 func (d *DocumentVersionApprovalDecisions) CountApprovedByQuorumID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, quorumID gid.GID, ) (int, error) { @@ -203,7 +203,7 @@ WHERE func (d *DocumentVersionApprovalDecisions) LoadByQuorumID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, quorumID gid.GID, cursor *page.Cursor[DocumentVersionApprovalDecisionOrderField], @@ -254,7 +254,7 @@ WHERE func (d *DocumentVersionApprovalDecision) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -315,7 +315,7 @@ INSERT INTO document_version_approval_decisions ( func (ds DocumentVersionApprovalDecisions) BulkInsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { if len(ds) == 0 { @@ -362,7 +362,7 @@ func (ds DocumentVersionApprovalDecisions) BulkInsert( func (d *DocumentVersionApprovalDecision) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -401,7 +401,7 @@ WHERE func (d *DocumentVersionApprovalDecision) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -426,7 +426,7 @@ WHERE func (d *DocumentVersionApprovalDecisions) CountByQuorumID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, quorumID gid.GID, filter *DocumentVersionApprovalDecisionFilter, diff --git a/pkg/coredata/document_version_approval_quorum.go b/pkg/coredata/document_version_approval_quorum.go index e1c7e042b..51ec51a9e 100644 --- a/pkg/coredata/document_version_approval_quorum.go +++ b/pkg/coredata/document_version_approval_quorum.go @@ -50,7 +50,7 @@ func (q DocumentVersionApprovalQuorum) CursorKey(orderBy DocumentVersionApproval panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (q *DocumentVersionApprovalQuorum) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (q *DocumentVersionApprovalQuorum) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { query := `SELECT organization_id FROM document_version_approval_quorums WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -66,7 +66,7 @@ func (q *DocumentVersionApprovalQuorum) AuthorizationAttributes(ctx context.Cont func (q *DocumentVersionApprovalQuorum) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -110,7 +110,7 @@ WHERE func (q *DocumentVersionApprovalQuorum) LoadLastByDocumentVersionID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentVersionID gid.GID, ) error { @@ -163,7 +163,7 @@ LIMIT 1 func (q *DocumentVersionApprovalQuorums) LoadAllByDocumentVersionID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentVersionID gid.GID, cursor *page.Cursor[DocumentVersionApprovalQuorumOrderField], @@ -214,7 +214,7 @@ WHERE func (q *DocumentVersionApprovalQuorums) CountByDocumentVersionID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentVersionID gid.GID, ) (int, error) { @@ -251,7 +251,7 @@ WHERE func (q *DocumentVersionApprovalQuorum) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { query := ` @@ -300,7 +300,7 @@ INSERT INTO document_version_approval_quorums ( func (q *DocumentVersionApprovalQuorum) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { query := ` @@ -325,7 +325,7 @@ WHERE func (q *DocumentVersionApprovalQuorum) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { query := ` diff --git a/pkg/coredata/document_version_signature.go b/pkg/coredata/document_version_signature.go index 3122d3155..90efe4d8d 100644 --- a/pkg/coredata/document_version_signature.go +++ b/pkg/coredata/document_version_signature.go @@ -64,7 +64,7 @@ func (pvs DocumentVersionSignature) CursorKey(orderBy DocumentVersionSignatureOr } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (dvs *DocumentVersionSignature) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (dvs *DocumentVersionSignature) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM document_version_signatures WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -80,7 +80,7 @@ func (dvs *DocumentVersionSignature) AuthorizationAttributes(ctx context.Context func (pvs *DocumentVersionSignature) LoadByDocumentVersionIDAndSignatory( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentVersionID gid.GID, signatory gid.GID, @@ -127,7 +127,7 @@ LIMIT 1 func (pvs *DocumentVersionSignature) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, signatureID gid.GID, ) error { @@ -171,7 +171,7 @@ WHERE func (pvs DocumentVersionSignature) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -229,7 +229,7 @@ INSERT INTO document_version_signatures ( func (pvss *DocumentVersionSignatures) LoadByDocumentVersionID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentVersionID gid.GID, cursor *page.Cursor[DocumentVersionSignatureOrderField], @@ -286,7 +286,7 @@ WHERE func (pvs *DocumentVersionSignature) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -323,7 +323,7 @@ WHERE func (pvs *DocumentVersionSignature) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, documentVersionSignatureID gid.GID, ) error { @@ -349,7 +349,7 @@ WHERE func (pvss *DocumentVersionSignaturesWithPeople) LoadByDocumentVersionIDWithPeople( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentVersionID gid.GID, limit int, @@ -424,7 +424,7 @@ LIMIT @limit func (pvs *DocumentVersionSignature) IsSignedByUserEmail( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentVersionID gid.GID, userEmail mail.Addr, @@ -476,7 +476,7 @@ SELECT EXISTS ( func (dvs *DocumentVersionSignatures) CountByDocumentVersionID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentVersionID gid.GID, filter *DocumentVersionSignatureFilter, diff --git a/pkg/coredata/electronic_signature.go b/pkg/coredata/electronic_signature.go index b02c3366c..d02c3919b 100644 --- a/pkg/coredata/electronic_signature.go +++ b/pkg/coredata/electronic_signature.go @@ -79,7 +79,7 @@ func (es *ElectronicSignature) NewEvent( func (es *ElectronicSignature) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -120,7 +120,7 @@ INSERT INTO electronic_signatures ( func (es *ElectronicSignature) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -180,7 +180,7 @@ WHERE func (es *ElectronicSignature) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -220,7 +220,7 @@ LIMIT 1 func (es *ElectronicSignature) LoadNextAcceptedForUpdateSkipLocked( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT @@ -256,7 +256,7 @@ FOR UPDATE SKIP LOCKED func (es *ElectronicSignature) LoadNextCompletedWithoutCertificateForUpdate( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT @@ -295,7 +295,7 @@ FOR UPDATE SKIP LOCKED func ResetStaleProcessingSignatures( ctx context.Context, - conn pg.Conn, + conn pg.Querier, staleAfter time.Duration, ) error { q := ` @@ -355,7 +355,7 @@ func (es *ElectronicSignature) computeSealV1() (string, error) { func ResetStaleCertificateProcessing( ctx context.Context, - conn pg.Conn, + conn pg.Querier, staleAfter time.Duration, ) error { q := ` diff --git a/pkg/coredata/electronic_signature_event.go b/pkg/coredata/electronic_signature_event.go index 8403fafd7..2cb22b081 100644 --- a/pkg/coredata/electronic_signature_event.go +++ b/pkg/coredata/electronic_signature_event.go @@ -44,7 +44,7 @@ type ( func (e *ElectronicSignatureEvent) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -81,7 +81,7 @@ INSERT INTO electronic_signature_events ( func (es *ElectronicSignatureEvents) LoadBySignatureID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, sigID gid.GID, ) error { diff --git a/pkg/coredata/email.go b/pkg/coredata/email.go index 9f05a3046..5e60d41eb 100644 --- a/pkg/coredata/email.go +++ b/pkg/coredata/email.go @@ -65,7 +65,7 @@ var ( // AuthorizationAttributes returns the authorization attributes for policy evaluation. // Email is identity-scoped (not org-scoped), so it returns an empty map. -func (e *Email) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (e *Email) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { return map[string]string{}, nil } @@ -104,7 +104,7 @@ func NewEmail( func (e *Email) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` INSERT INTO emails ( @@ -167,7 +167,7 @@ VALUES ( func (emails Emails) BulkInsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, ) error { if len(emails) == 0 { return nil @@ -202,7 +202,7 @@ func (emails Emails) BulkInsert( func (e *Email) LoadNextPendingForUpdateSkipLocked( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT @@ -237,7 +237,7 @@ FOR UPDATE SKIP LOCKED func (e *Email) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` UPDATE emails @@ -269,7 +269,7 @@ WHERE id = @id func ResetStaleProcessingEmails( ctx context.Context, - conn pg.Conn, + conn pg.Querier, staleAfter time.Duration, ) error { q := ` diff --git a/pkg/coredata/email_attachment.go b/pkg/coredata/email_attachment.go index 3a1249fa4..ccbc2a4a5 100644 --- a/pkg/coredata/email_attachment.go +++ b/pkg/coredata/email_attachment.go @@ -48,7 +48,7 @@ func NewEmailAttachment(emailID, fileID gid.GID, filename string) *EmailAttachme func (a *EmailAttachment) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` INSERT INTO email_attachments (id, email_id, file_id, filename, created_at) @@ -72,7 +72,7 @@ VALUES (@id, @email_id, @file_id, @filename, @created_at) func (a *EmailAttachments) LoadByEmailID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, emailID gid.GID, ) error { q := ` diff --git a/pkg/coredata/evidence.go b/pkg/coredata/evidence.go index ec62d626e..205c45feb 100644 --- a/pkg/coredata/evidence.go +++ b/pkg/coredata/evidence.go @@ -59,7 +59,7 @@ func (e Evidence) CursorKey(orderBy EvidenceOrderField) page.CursorKey { } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (e *Evidence) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (e *Evidence) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM evidences WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -75,7 +75,7 @@ func (e *Evidence) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (m func (e Evidence) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -141,7 +141,7 @@ WHERE evidences.state = 'REQUESTED'; func (e Evidence) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -216,7 +216,7 @@ VALUES ( func (e *Evidence) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, evidenceID gid.GID, ) error { @@ -266,7 +266,7 @@ LIMIT 1; func (e *Evidences) CountByMeasureID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, measureID gid.GID, ) (int, error) { @@ -298,7 +298,7 @@ WHERE func (e *Evidences) LoadByMeasureID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, measureID gid.GID, cursor *page.Cursor[EvidenceOrderField], @@ -350,7 +350,7 @@ WHERE func (e *Evidences) CountByTaskID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, taskID gid.GID, ) (int, error) { @@ -382,7 +382,7 @@ WHERE func (e *Evidences) LoadByTaskID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, taskID gid.GID, cursor *page.Cursor[EvidenceOrderField], @@ -434,7 +434,7 @@ WHERE func (e Evidence) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -475,7 +475,7 @@ WHERE func (e Evidence) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -501,7 +501,7 @@ WHERE func (e *Evidence) LoadNextPendingDescriptionForUpdateSkipLocked( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT @@ -550,7 +550,7 @@ FOR UPDATE SKIP LOCKED; func ResetStaleDescriptionProcessing( ctx context.Context, - conn pg.Conn, + conn pg.Querier, staleAfter time.Duration, ) error { q := ` diff --git a/pkg/coredata/export_job.go b/pkg/coredata/export_job.go index 4e809885b..72231593c 100644 --- a/pkg/coredata/export_job.go +++ b/pkg/coredata/export_job.go @@ -63,7 +63,7 @@ var ( ) // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (ej *ExportJob) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (ej *ExportJob) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM export_jobs WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -79,7 +79,7 @@ func (ej *ExportJob) AuthorizationAttributes(ctx context.Context, conn pg.Conn) func (ej *ExportJob) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -121,7 +121,7 @@ INSERT INTO export_jobs ( func (ej *ExportJob) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -153,7 +153,7 @@ WHERE func (ej *ExportJob) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -197,7 +197,7 @@ WHERE func (ej *ExportJob) LoadNextPendingForUpdateSkipLocked( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT diff --git a/pkg/coredata/file.go b/pkg/coredata/file.go index b9c7a629d..abebf3fbe 100644 --- a/pkg/coredata/file.go +++ b/pkg/coredata/file.go @@ -65,7 +65,7 @@ func (f *File) GetMimeType() string { var _ filemanager.File = (*File)(nil) // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (f *File) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (f *File) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM files WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -81,7 +81,7 @@ func (f *File) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[s func (f *File) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, fileID gid.GID, ) error { @@ -133,7 +133,7 @@ LIMIT 1; func (f *Files) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, fileIDs []gid.GID, ) error { @@ -179,7 +179,7 @@ WHERE func (f File) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -245,7 +245,7 @@ VALUES ( func (f *File) LoadPublicByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, fileID gid.GID, ) error { q := ` @@ -292,7 +292,7 @@ LIMIT 1; return nil } -func (f File) SoftDelete(ctx context.Context, conn pg.Conn, scope Scoper) error { +func (f File) SoftDelete(ctx context.Context, conn pg.Tx, scope Scoper) error { q := ` UPDATE files SET deleted_at = NOW() diff --git a/pkg/coredata/finding.go b/pkg/coredata/finding.go index d0913b3d7..a48bb5864 100644 --- a/pkg/coredata/finding.go +++ b/pkg/coredata/finding.go @@ -74,7 +74,7 @@ func (f *Finding) CursorKey(field FindingOrderField) page.CursorKey { panic(fmt.Sprintf("unsupported order by: %s", field)) } -func (f *Finding) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (f *Finding) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM findings WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -90,7 +90,7 @@ func (f *Finding) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (ma func (f *Finding) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, findingID gid.GID, ) error { @@ -145,7 +145,7 @@ LIMIT 1; func (fs *Findings) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *FindingFilter, @@ -180,7 +180,7 @@ WHERE func (fs *Findings) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[FindingOrderField], @@ -240,7 +240,7 @@ WHERE func (f *Finding) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { lockQuery := `SELECT pg_advisory_xact_lock(hashtext(@organization_id::text))` @@ -336,7 +336,7 @@ RETURNING reference_id func (f *Finding) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -389,7 +389,7 @@ WHERE func (f *Finding) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -412,7 +412,7 @@ WHERE return nil } -func (fs Findings) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error { +func (fs Findings) Snapshot(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error { query := ` INSERT INTO findings ( id, @@ -503,7 +503,7 @@ WHERE %s AND live.organization_id = @organization_id func (fs *Findings) LoadByAuditID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, auditID gid.GID, cursor *page.Cursor[FindingOrderField], @@ -589,7 +589,7 @@ WHERE %s func (fs *Findings) CountByAuditID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, auditID gid.GID, filter *FindingFilter, diff --git a/pkg/coredata/finding_audit.go b/pkg/coredata/finding_audit.go index 4741ec92e..f3a540d4d 100644 --- a/pkg/coredata/finding_audit.go +++ b/pkg/coredata/finding_audit.go @@ -39,7 +39,7 @@ type ( func (fa FindingAudit) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -81,7 +81,7 @@ ON CONFLICT (finding_id, audit_id) DO NOTHING; func (fa FindingAudit) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, findingID gid.GID, auditID gid.GID, diff --git a/pkg/coredata/framework.go b/pkg/coredata/framework.go index f1fe0a75b..1dc2aefcb 100644 --- a/pkg/coredata/framework.go +++ b/pkg/coredata/framework.go @@ -54,7 +54,7 @@ func (f *Framework) CursorKey(orderBy FrameworkOrderField) page.CursorKey { } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (f *Framework) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (f *Framework) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM frameworks WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -70,7 +70,7 @@ func (f *Framework) AuthorizationAttributes(ctx context.Context, conn pg.Conn) ( func (f *Frameworks) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -101,7 +101,7 @@ WHERE func (f *Frameworks) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[FrameworkOrderField], @@ -147,7 +147,7 @@ WHERE func (f *Framework) LoadByReferenceID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, referenceID string, ) error { @@ -195,7 +195,7 @@ LIMIT 1; func (f *Framework) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, frameworkID gid.GID, ) error { @@ -243,7 +243,7 @@ LIMIT 1; func (f *Frameworks) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, frameworkIDs []gid.GID, ) error { @@ -287,7 +287,7 @@ WHERE func (f Framework) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -348,7 +348,7 @@ VALUES ( func (f Framework) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, frameworkID gid.GID, ) error { @@ -371,7 +371,7 @@ WHERE func (f *Framework) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/identity.go b/pkg/coredata/identity.go index 83a10f186..155dc5762 100644 --- a/pkg/coredata/identity.go +++ b/pkg/coredata/identity.go @@ -56,7 +56,7 @@ func (i Identity) CursorKey(orderBy IdentityOrderField) page.CursorKey { // Tenant id scope is not applied because we want to access identities across all tenants for authentication purposes. func (i *Identity) LoadByEmail( ctx context.Context, - conn pg.Conn, + conn pg.Querier, email mail.Addr, ) error { q := ` @@ -100,7 +100,7 @@ LIMIT 1; // Tenant id scope is not applied because we want to access identities across all tenants for authentication purposes. func (i *Identity) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, identityID gid.GID, ) error { q := ` @@ -143,7 +143,7 @@ LIMIT 1; // AuthorizationAttributes loads the minimal authorization attributes for policy condition evaluation. // It is intentionally lightweight and does not populate the Identity struct. -func (i *Identity) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (i *Identity) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := ` SELECT id, @@ -173,7 +173,7 @@ WHERE func (i *Identity) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` INSERT INTO @@ -217,7 +217,7 @@ VALUES ( return nil } -func (i *Identity) Update(ctx context.Context, conn pg.Conn) error { +func (i *Identity) Update(ctx context.Context, conn pg.Tx) error { q := ` UPDATE identities @@ -257,7 +257,7 @@ WHERE // LoadBySAMLSubject loads an identity by their SAML subject (NameID) func (i *Identity) LoadBySAMLSubject( ctx context.Context, - conn pg.Conn, + conn pg.Querier, samlSubject string, ) error { q := ` @@ -300,7 +300,7 @@ LIMIT 1; func (i *Identity) CountMemberships( ctx context.Context, - conn pg.Conn, + conn pg.Querier, ) (int, error) { q := ` SELECT diff --git a/pkg/coredata/invitation.go b/pkg/coredata/invitation.go index 5022aabd0..e6e3663c1 100644 --- a/pkg/coredata/invitation.go +++ b/pkg/coredata/invitation.go @@ -50,7 +50,7 @@ func (i Invitation) CursorKey(orderBy InvitationOrderField) page.CursorKey { panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (i *Invitation) Insert(ctx context.Context, conn pg.Conn, scope Scoper) error { +func (i *Invitation) Insert(ctx context.Context, conn pg.Tx, scope Scoper) error { query := ` INSERT INTO iam_invitations ( @@ -90,7 +90,7 @@ VALUES ( func (i *Invitation) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -141,7 +141,7 @@ WHERE // AuthorizationAttributes loads the minimal authorization attributes for policy condition evaluation. // It is intentionally lightweight and does not populate the Invitation struct. -func (i *Invitation) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (i *Invitation) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := ` SELECT email, organization_id @@ -167,7 +167,7 @@ LIMIT 1; }, nil } -func (i *Invitation) Update(ctx context.Context, conn pg.Conn, scope Scoper) error { +func (i *Invitation) Update(ctx context.Context, conn pg.Tx, scope Scoper) error { query := ` UPDATE iam_invitations @@ -198,7 +198,7 @@ WHERE return nil } -func (i *Invitation) Delete(ctx context.Context, conn pg.Conn, scope Scoper, invitationID gid.GID) error { +func (i *Invitation) Delete(ctx context.Context, conn pg.Tx, scope Scoper, invitationID gid.GID) error { query := ` DELETE FROM iam_invitations @@ -228,7 +228,7 @@ WHERE func (i *Invitations) LoadByUserID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, userID gid.GID, cursor *page.Cursor[InvitationOrderField], @@ -281,7 +281,7 @@ WHERE func (i *Invitations) ExpireByUserID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, userID gid.GID, filter *InvitationFilter, diff --git a/pkg/coredata/mailing_list.go b/pkg/coredata/mailing_list.go index ee42639b5..d59743576 100644 --- a/pkg/coredata/mailing_list.go +++ b/pkg/coredata/mailing_list.go @@ -35,7 +35,7 @@ type MailingList struct { UpdatedAt time.Time `db:"updated_at"` } -func (ml *MailingList) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (ml *MailingList) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM mailing_lists WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -51,7 +51,7 @@ func (ml *MailingList) AuthorizationAttributes(ctx context.Context, conn pg.Conn func (ml *MailingList) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -95,7 +95,7 @@ LIMIT 1; func (ml *MailingList) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -131,7 +131,7 @@ WHERE func (ml *MailingList) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/mailing_list_subscriber.go b/pkg/coredata/mailing_list_subscriber.go index 4bbe6cd56..65c27fb07 100644 --- a/pkg/coredata/mailing_list_subscriber.go +++ b/pkg/coredata/mailing_list_subscriber.go @@ -44,7 +44,7 @@ type ( MailingListSubscribers []*MailingListSubscriber ) -func (cns *MailingListSubscriber) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (cns *MailingListSubscriber) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM mailing_list_subscribers WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -69,7 +69,7 @@ func (cns *MailingListSubscriber) CursorKey(orderBy MailingListSubscriberOrderFi func (cns *MailingListSubscriber) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -119,7 +119,7 @@ LIMIT 1; func (cns *MailingListSubscriber) LoadByMailingListIDAndEmail( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, mailingListID gid.GID, email mail.Addr, @@ -172,7 +172,7 @@ LIMIT 1; func (cns *MailingListSubscriber) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -225,7 +225,7 @@ VALUES ( func (cns *MailingListSubscriber) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -261,7 +261,7 @@ WHERE func (cns *MailingListSubscriber) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -291,7 +291,7 @@ WHERE func (cnss *MailingListSubscribers) CountByMailingListID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, mailingListID gid.GID, ) (int, error) { @@ -323,7 +323,7 @@ WHERE func (cnss *MailingListSubscribers) LoadAllConfirmedByMailingListID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, mailingListID gid.GID, ) error { @@ -367,7 +367,7 @@ WHERE func (cnss *MailingListSubscribers) LoadByMailingListID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, mailingListID gid.GID, cursor *page.Cursor[MailingListSubscriberOrderField], diff --git a/pkg/coredata/mailing_list_update.go b/pkg/coredata/mailing_list_update.go index 0f8f5ef83..36ce5e6d2 100644 --- a/pkg/coredata/mailing_list_update.go +++ b/pkg/coredata/mailing_list_update.go @@ -53,7 +53,7 @@ func (mlu *MailingListUpdate) CursorKey(orderBy MailingListUpdateOrderField) pag panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (mlu *MailingListUpdate) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (mlu *MailingListUpdate) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM mailing_list_updates WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -67,7 +67,7 @@ func (mlu *MailingListUpdate) AuthorizationAttributes(ctx context.Context, conn return map[string]string{"organization_id": organizationID.String()}, nil } -func (mlu *MailingListUpdate) Insert(ctx context.Context, conn pg.Conn, scope Scoper) error { +func (mlu *MailingListUpdate) Insert(ctx context.Context, conn pg.Tx, scope Scoper) error { q := ` INSERT INTO mailing_list_updates ( id, @@ -107,7 +107,7 @@ INSERT INTO mailing_list_updates ( return err } -func (mlu *MailingListUpdate) Update(ctx context.Context, conn pg.Conn, scope Scoper) error { +func (mlu *MailingListUpdate) Update(ctx context.Context, conn pg.Tx, scope Scoper) error { q := ` UPDATE mailing_list_updates SET @@ -140,7 +140,7 @@ WHERE return nil } -func (mlu *MailingListUpdate) Delete(ctx context.Context, conn pg.Conn, scope Scoper) error { +func (mlu *MailingListUpdate) Delete(ctx context.Context, conn pg.Tx, scope Scoper) error { q := ` DELETE FROM mailing_list_updates WHERE @@ -164,7 +164,7 @@ WHERE return nil } -func (mlu *MailingListUpdate) LoadByID(ctx context.Context, conn pg.Conn, scope Scoper, id gid.GID) error { +func (mlu *MailingListUpdate) LoadByID(ctx context.Context, conn pg.Querier, scope Scoper, id gid.GID) error { q := ` SELECT id, @@ -207,7 +207,7 @@ LIMIT 1; func (mlul *MailingListUpdateItems) LoadSentByMailingListID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, mailingListID gid.GID, cursor *page.Cursor[MailingListUpdateOrderField], @@ -254,7 +254,7 @@ WHERE func (mlul *MailingListUpdateItems) LoadByMailingListID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, mailingListID gid.GID, cursor *page.Cursor[MailingListUpdateOrderField], @@ -300,7 +300,7 @@ WHERE func (mlul *MailingListUpdateItems) CountByMailingListID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, mailingListID gid.GID, ) (int, error) { @@ -329,7 +329,7 @@ WHERE func (mlu *MailingListUpdate) LoadNextEnqueuedForUpdateSkipLocked( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT @@ -367,7 +367,7 @@ FOR UPDATE SKIP LOCKED func ResetStaleProcessingMailingListUpdates( ctx context.Context, - conn pg.Conn, + conn pg.Tx, staleAfter time.Duration, ) error { q := ` diff --git a/pkg/coredata/measure.go b/pkg/coredata/measure.go index 4a8f4603b..217149dce 100644 --- a/pkg/coredata/measure.go +++ b/pkg/coredata/measure.go @@ -57,7 +57,7 @@ func (m Measure) CursorKey(orderBy MeasureOrderField) page.CursorKey { } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (m *Measure) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (m *Measure) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM measures WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -73,7 +73,7 @@ func (m *Measure) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (ma func (m *Measures) CountByRiskID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, riskID gid.GID, filter *MeasureFilter, @@ -118,7 +118,7 @@ WHERE %s func (m *Measures) LoadByRiskID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, riskID gid.GID, cursor *page.Cursor[MeasureOrderField], @@ -185,7 +185,7 @@ WHERE %s func (m *Measures) CountByControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, filter *MeasureFilter, @@ -230,7 +230,7 @@ WITH mtgtns AS ( func (m *Measures) LoadByControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, cursor *page.Cursor[MeasureOrderField], @@ -297,7 +297,7 @@ WHERE %s func (m *Measures) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *MeasureFilter, @@ -330,7 +330,7 @@ WHERE func (m *Measures) LoadDistinctCategoriesByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) ([]string, error) { @@ -365,7 +365,7 @@ ORDER BY func (m *Measures) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[MeasureOrderField], @@ -414,7 +414,7 @@ WHERE func (m *Measure) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, measureID gid.GID, ) error { @@ -463,7 +463,7 @@ LIMIT 1; func (m *Measures) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, measureIDs []gid.GID, ) error { @@ -507,7 +507,7 @@ WHERE func (m *Measure) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -583,7 +583,7 @@ RETURNING func (m Measure) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -643,7 +643,7 @@ VALUES ( func (m *Measure) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -676,7 +676,7 @@ WHERE %s func (m *Measure) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, measureID gid.GID, ) error { diff --git a/pkg/coredata/meeting.go b/pkg/coredata/meeting.go index 99d5180a0..a87c7ffba 100644 --- a/pkg/coredata/meeting.go +++ b/pkg/coredata/meeting.go @@ -55,7 +55,7 @@ func (m Meeting) CursorKey(orderBy MeetingOrderField) page.CursorKey { } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (m *Meeting) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (m *Meeting) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM meetings WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -71,7 +71,7 @@ func (m *Meeting) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (ma func (m *Meeting) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, meetingID gid.GID, ) error { @@ -117,7 +117,7 @@ LIMIT 1; func (m *Meetings) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[MeetingOrderField], @@ -160,7 +160,7 @@ WHERE func (m *Meetings) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -191,7 +191,7 @@ WHERE func (m *Meeting) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -239,7 +239,7 @@ VALUES ( func (m *Meeting) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -278,7 +278,7 @@ WHERE %s func (m *Meeting) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/meeting_attendee.go b/pkg/coredata/meeting_attendee.go index 438ebe31e..667a6281d 100644 --- a/pkg/coredata/meeting_attendee.go +++ b/pkg/coredata/meeting_attendee.go @@ -37,7 +37,7 @@ type ( func (ma *MeetingAttendees) Merge( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, meetingID gid.GID, organizationID gid.GID, diff --git a/pkg/coredata/membership.go b/pkg/coredata/membership.go index 28a95a921..36c0216fe 100644 --- a/pkg/coredata/membership.go +++ b/pkg/coredata/membership.go @@ -54,7 +54,7 @@ func (m Membership) CursorKey(orderBy MembershipOrderField) page.CursorKey { func (m *Membership) LoadByIdentityIDAndOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, identityID gid.GID, organizationID gid.GID, @@ -102,7 +102,7 @@ WHERE return nil } -func (m *Membership) Insert(ctx context.Context, conn pg.Conn, scope Scoper) error { +func (m *Membership) Insert(ctx context.Context, conn pg.Tx, scope Scoper) error { query := ` INSERT INTO iam_memberships ( @@ -154,7 +154,7 @@ VALUES ( func (m *Membership) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, membershipID gid.GID, ) error { @@ -198,7 +198,7 @@ WHERE return nil } -func (m *Membership) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (m *Membership) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := ` SELECT identity_id, @@ -234,7 +234,7 @@ LIMIT 1; func (m *Membership) LoadByIdentityAndOrg( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, identityID gid.GID, organizationID gid.GID, @@ -281,7 +281,7 @@ WHERE return nil } -func (m *Membership) Update(ctx context.Context, conn pg.Conn, scope Scoper) error { +func (m *Membership) Update(ctx context.Context, conn pg.Tx, scope Scoper) error { query := ` UPDATE iam_memberships @@ -314,7 +314,7 @@ WHERE return nil } -func (m *Membership) Delete(ctx context.Context, conn pg.Conn, scope Scoper, membershipID gid.GID) error { +func (m *Membership) Delete(ctx context.Context, conn pg.Tx, scope Scoper, membershipID gid.GID) error { query := ` DELETE FROM iam_memberships @@ -344,7 +344,7 @@ WHERE func (m *Membership) LoadActiveByIdentityIDAndOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, identityID gid.GID, organizationID gid.GID, ) error { diff --git a/pkg/coredata/membership_profile.go b/pkg/coredata/membership_profile.go index 00d3da848..0ca7c4264 100644 --- a/pkg/coredata/membership_profile.go +++ b/pkg/coredata/membership_profile.go @@ -87,7 +87,7 @@ func (p MembershipProfile) CursorKey(orderBy MembershipProfileOrderField) page.C panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (p *MembershipProfile) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (p *MembershipProfile) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id, identity_id FROM iam_membership_profiles WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -107,7 +107,7 @@ func (p *MembershipProfile) AuthorizationAttributes(ctx context.Context, conn pg func (p *MembershipProfile) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, profileID gid.GID, ) error { @@ -183,7 +183,7 @@ LIMIT 1; func (p *MembershipProfile) LoadByIdentityIDAndOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, identityID gid.GID, organizationID gid.GID, @@ -264,7 +264,7 @@ LIMIT 1; func (p *MembershipProfiles) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, profileIDs []gid.GID, ) error { @@ -335,7 +335,7 @@ WHERE func (p *MembershipProfiles) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[MembershipProfileOrderField], @@ -449,7 +449,7 @@ WHERE func (p *MembershipProfiles) LoadByIdentityID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, identityID gid.GID, cursor *page.Cursor[MembershipProfileOrderField], filter *MembershipProfileFilter, @@ -561,7 +561,7 @@ WHERE func (p *MembershipProfiles) LoadByDocumentVersionID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentVersionID gid.GID, cursor *page.Cursor[MembershipProfileOrderField], @@ -682,7 +682,7 @@ INNER JOIN identities i ON i.id = p.identity_id func (p *MembershipProfiles) CountByDocumentVersionID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentVersionID gid.GID, ) (int, error) { @@ -720,7 +720,7 @@ WHERE func (p *MembershipProfiles) LoadByMeetingID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, meetingID gid.GID, ) error { @@ -836,7 +836,7 @@ ORDER BY func (p *MembershipProfiles) LoadAwaitingSigning( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -912,7 +912,7 @@ INNER JOIN signatories ON p.id = signatories.signed_by_profile_id func (p *MembershipProfiles) CountByIdentityID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, identityID gid.GID, filter *MembershipProfileFilter, ) (int, error) { @@ -945,7 +945,7 @@ WHERE func (p *MembershipProfiles) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *MembershipProfileFilter, @@ -981,7 +981,7 @@ WHERE func (p *MembershipProfiles) CountActiveOwnerByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -1020,7 +1020,7 @@ WHERE func (p *MembershipProfile) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` INSERT INTO @@ -1146,7 +1146,7 @@ VALUES ( func (p *MembershipProfile) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -1235,7 +1235,7 @@ WHERE func (p *MembershipProfiles) ResetSCIMSources( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) error { @@ -1269,7 +1269,7 @@ WHERE func (p *MembershipProfile) ClearExternalID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, externalID string, organizationID gid.GID, @@ -1305,7 +1305,7 @@ WHERE func (p *MembershipProfile) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, profileID gid.GID, ) error { diff --git a/pkg/coredata/obligation.go b/pkg/coredata/obligation.go index d3e44defb..4e176c761 100644 --- a/pkg/coredata/obligation.go +++ b/pkg/coredata/obligation.go @@ -65,7 +65,7 @@ func (o *Obligation) CursorKey(field ObligationOrderField) page.CursorKey { panic(fmt.Sprintf("unsupported order by: %s", field)) } -func (o *Obligation) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (o *Obligation) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM obligations WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -81,7 +81,7 @@ func (o *Obligation) AuthorizationAttributes(ctx context.Context, conn pg.Conn) func (o *Obligation) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, obligationID gid.GID, ) error { @@ -133,7 +133,7 @@ LIMIT 1; func (os *Obligations) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *ObligationFilter, @@ -168,7 +168,7 @@ WHERE func (os *Obligations) CountByRiskID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, riskID gid.GID, filter *ObligationFilter, @@ -214,7 +214,7 @@ WHERE %s func (os *Obligations) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[ObligationOrderField], @@ -271,7 +271,7 @@ WHERE func (os *Obligations) LoadByRiskID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, riskID gid.GID, cursor *page.Cursor[ObligationOrderField], @@ -353,7 +353,7 @@ WHERE %s func (os *Obligations) CountByControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, filter *ObligationFilter, @@ -398,7 +398,7 @@ WHERE %s func (os *Obligations) LoadByControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, cursor *page.Cursor[ObligationOrderField], @@ -478,7 +478,7 @@ WHERE %s func (o *Obligation) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -551,7 +551,7 @@ INSERT INTO obligations ( func (o *Obligation) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -601,7 +601,7 @@ WHERE func (o *Obligation) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -625,7 +625,7 @@ WHERE return nil } -func (os Obligations) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error { +func (os Obligations) Snapshot(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error { query := ` INSERT INTO obligations ( id, diff --git a/pkg/coredata/oidc_state.go b/pkg/coredata/oidc_state.go index 5b8d81bf2..38c472e26 100644 --- a/pkg/coredata/oidc_state.go +++ b/pkg/coredata/oidc_state.go @@ -34,7 +34,7 @@ type OIDCState struct { ExpiresAt time.Time `db:"expires_at"` } -func (s *OIDCState) Insert(ctx context.Context, conn pg.Conn) error { +func (s *OIDCState) Insert(ctx context.Context, conn pg.Tx) error { query := ` INSERT INTO iam_oidc_states (id, provider, nonce, code_verifier, continue_url, created_at, expires_at) VALUES (@id, @provider, @nonce, @code_verifier, @continue_url, @created_at, @expires_at) @@ -58,7 +58,7 @@ VALUES (@id, @provider, @nonce, @code_verifier, @continue_url, @created_at, @exp return nil } -func (s *OIDCState) LoadByIDForUpdate(ctx context.Context, conn pg.Conn, id string) error { +func (s *OIDCState) LoadByIDForUpdate(ctx context.Context, conn pg.Tx, id string) error { query := ` SELECT id, provider, nonce, code_verifier, continue_url, created_at, expires_at FROM iam_oidc_states @@ -83,7 +83,7 @@ FOR UPDATE return nil } -func (s *OIDCState) Delete(ctx context.Context, conn pg.Conn) error { +func (s *OIDCState) Delete(ctx context.Context, conn pg.Tx) error { query := `DELETE FROM iam_oidc_states WHERE id = @id` _, err := conn.Exec(ctx, query, pgx.StrictNamedArgs{"id": s.ID}) @@ -94,7 +94,7 @@ func (s *OIDCState) Delete(ctx context.Context, conn pg.Conn) error { return nil } -func (s *OIDCState) DeleteExpired(ctx context.Context, conn pg.Conn, now time.Time) (int64, error) { +func (s *OIDCState) DeleteExpired(ctx context.Context, conn pg.Tx, now time.Time) (int64, error) { query := `DELETE FROM iam_oidc_states WHERE expires_at < @now` result, err := conn.Exec(ctx, query, pgx.StrictNamedArgs{"now": now}) diff --git a/pkg/coredata/organization.go b/pkg/coredata/organization.go index 9ff86de3c..70c97a0fc 100644 --- a/pkg/coredata/organization.go +++ b/pkg/coredata/organization.go @@ -46,7 +46,7 @@ type ( Organizations []*Organization ) -func (o *Organization) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (o *Organization) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT id FROM organizations WHERE id = $1 LIMIT 1;` var id gid.GID @@ -75,7 +75,7 @@ func (o Organization) CursorKey(orderBy OrganizationOrderField) page.CursorKey { func (o *Organization) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) error { @@ -127,7 +127,7 @@ LIMIT 1; func (o *Organizations) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationIDs []gid.GID, ) error { @@ -174,7 +174,7 @@ WHERE func (o *Organizations) LoadByIdentityID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, identityID gid.GID, cursor *page.Cursor[OrganizationOrderField], @@ -232,7 +232,7 @@ WHERE func (o *Organization) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` INSERT INTO organizations ( @@ -277,7 +277,7 @@ INSERT INTO organizations ( func (o *Organization) Update( ctx context.Context, scope Scoper, - conn pg.Conn, + conn pg.Tx, ) error { q := ` UPDATE organizations @@ -323,7 +323,7 @@ WHERE func (o *Organization) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, organizationID gid.GID, ) error { q := ` @@ -343,7 +343,7 @@ WHERE id = @id func (o *Organization) LoadByCustomDomainID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, customDomainID gid.GID, ) error { diff --git a/pkg/coredata/organization_context.go b/pkg/coredata/organization_context.go index 928c7774b..33eacef17 100644 --- a/pkg/coredata/organization_context.go +++ b/pkg/coredata/organization_context.go @@ -41,7 +41,7 @@ type ( func (oc *OrganizationContext) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) error { @@ -89,7 +89,7 @@ LIMIT 1; func (oc *OrganizationContext) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -138,7 +138,7 @@ INSERT INTO organization_contexts ( func (oc *OrganizationContext) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/personal_api_key.go b/pkg/coredata/personal_api_key.go index 1f45a7003..b10a8ff6f 100644 --- a/pkg/coredata/personal_api_key.go +++ b/pkg/coredata/personal_api_key.go @@ -52,7 +52,7 @@ func (a *PersonalAPIKey) CursorKey(orderBy PersonalAPIKeyOrderField) page.Cursor func (a *PersonalAPIKey) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, apiKeyID gid.GID, ) error { q := ` @@ -93,7 +93,7 @@ LIMIT 1; return nil } -func (a *PersonalAPIKey) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (a *PersonalAPIKey) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := "SELECT identity_id FROM iam_personal_api_keys WHERE id = $1 LIMIT 1;" var identityID gid.GID @@ -109,7 +109,7 @@ func (a *PersonalAPIKey) AuthorizationAttributes(ctx context.Context, conn pg.Co func (a *PersonalAPIKeys) LoadByIdentityID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, identityID gid.GID, ) error { q := ` @@ -146,7 +146,7 @@ ORDER BY created_at DESC; return nil } -func (a *PersonalAPIKeys) CountByIdentityID(ctx context.Context, conn pg.Conn, identityID gid.GID) (int, error) { +func (a *PersonalAPIKeys) CountByIdentityID(ctx context.Context, conn pg.Querier, identityID gid.GID) (int, error) { q := ` SELECT COUNT(*) @@ -169,7 +169,7 @@ ORDER BY created_at DESC; func (a *PersonalAPIKey) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` INSERT INTO @@ -207,7 +207,7 @@ VALUES ( func (a *PersonalAPIKey) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` UPDATE @@ -241,7 +241,7 @@ WHERE func (a *PersonalAPIKey) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` DELETE FROM diff --git a/pkg/coredata/processing_activities.go b/pkg/coredata/processing_activities.go index 304b62d4e..9feb3fff5 100644 --- a/pkg/coredata/processing_activities.go +++ b/pkg/coredata/processing_activities.go @@ -70,7 +70,7 @@ func (p *ProcessingActivity) CursorKey(field ProcessingActivityOrderField) page. panic(fmt.Sprintf("unsupported order by: %s", field)) } -func (p *ProcessingActivity) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (p *ProcessingActivity) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM processing_activities WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -86,7 +86,7 @@ func (p *ProcessingActivity) AuthorizationAttributes(ctx context.Context, conn p func (p *ProcessingActivity) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, processingActivityID gid.GID, ) error { @@ -147,7 +147,7 @@ LIMIT 1; func (p *ProcessingActivities) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *ProcessingActivityFilter, @@ -182,7 +182,7 @@ WHERE func (p *ProcessingActivities) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[ProcessingActivityOrderField], @@ -248,7 +248,7 @@ WHERE func (p *ProcessingActivities) LoadAllByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *ProcessingActivityFilter, @@ -312,7 +312,7 @@ ORDER BY created_at DESC func (p *ProcessingActivity) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -412,7 +412,7 @@ INSERT INTO processing_activities ( func (p *ProcessingActivity) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -481,7 +481,7 @@ WHERE func (p *ProcessingActivity) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -505,7 +505,7 @@ WHERE return nil } -func (pas ProcessingActivities) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error { +func (pas ProcessingActivities) Snapshot(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error { snapshotters := []ProcessingActivitySnapshotter{ProcessingActivities{}, Vendors{}, ProcessingActivityVendors{}, DataProtectionImpactAssessments{}, TransferImpactAssessments{}} for _, snapshotter := range snapshotters { @@ -519,7 +519,7 @@ func (pas ProcessingActivities) Snapshot(ctx context.Context, conn pg.Conn, scop func (pas ProcessingActivities) InsertProcessingActivitySnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/processing_activity_vendor.go b/pkg/coredata/processing_activity_vendor.go index c3c0a0591..baedbcdbc 100644 --- a/pkg/coredata/processing_activity_vendor.go +++ b/pkg/coredata/processing_activity_vendor.go @@ -37,13 +37,13 @@ type ( ProcessingActivityVendors []*ProcessingActivityVendor ProcessingActivitySnapshotter interface { - InsertProcessingActivitySnapshots(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error + InsertProcessingActivitySnapshots(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error } ) func (pav ProcessingActivityVendors) Merge( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, processingActivityID gid.GID, organizationID gid.GID, @@ -89,7 +89,7 @@ WHEN NOT MATCHED func (pav ProcessingActivityVendors) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, processingActivityID gid.GID, organizationID gid.GID, @@ -127,7 +127,7 @@ FROM vendor_ids func (pav ProcessingActivityVendors) InsertProcessingActivitySnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/report.go b/pkg/coredata/report.go index 4ecd83469..74f70a90c 100644 --- a/pkg/coredata/report.go +++ b/pkg/coredata/report.go @@ -42,7 +42,7 @@ type ( Reports []*Report ) -func (r *Report) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (r *Report) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM reports WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -58,7 +58,7 @@ func (r *Report) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map func (r *Report) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, reportID gid.GID, ) error { @@ -106,7 +106,7 @@ LIMIT 1; func (r *Reports) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, reportIDs []gid.GID, ) error { @@ -149,7 +149,7 @@ WHERE func (r *Report) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -198,7 +198,7 @@ INSERT INTO reports ( func (r *Report) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -236,7 +236,7 @@ WHERE func (r *Report) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/rights_requests.go b/pkg/coredata/rights_requests.go index ab6b301f0..252469dcd 100644 --- a/pkg/coredata/rights_requests.go +++ b/pkg/coredata/rights_requests.go @@ -61,7 +61,7 @@ func (rr *RightsRequest) CursorKey(field RightsRequestOrderField) page.CursorKey } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (rr *RightsRequest) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (rr *RightsRequest) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM rights_requests WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -77,7 +77,7 @@ func (rr *RightsRequest) AuthorizationAttributes(ctx context.Context, conn pg.Co func (rr *RightsRequest) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, rightsRequestID gid.GID, ) error { @@ -128,7 +128,7 @@ LIMIT 1; func (rrs *RightsRequests) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -160,7 +160,7 @@ WHERE func (rrs *RightsRequests) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[RightsRequestOrderField], @@ -209,7 +209,7 @@ WHERE func (rr *RightsRequest) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -267,7 +267,7 @@ INSERT INTO rights_requests ( func (rr *RightsRequest) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -310,7 +310,7 @@ WHERE func (rr *RightsRequest) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/risk.go b/pkg/coredata/risk.go index 90c948f4d..6e7ad792c 100644 --- a/pkg/coredata/risk.go +++ b/pkg/coredata/risk.go @@ -55,7 +55,7 @@ type ( Risks []*Risk RiskSnapshotter interface { - InsertRiskSnapshots(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error + InsertRiskSnapshots(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error } ) @@ -80,7 +80,7 @@ func (r *Risk) CursorKey(orderBy RiskOrderField) page.CursorKey { panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (r *Risk) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (r *Risk) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM risks WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -96,7 +96,7 @@ func (r *Risk) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[s func (r *Risks) CountByMeasureID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, measureID gid.GID, filter *RiskFilter, @@ -140,7 +140,7 @@ WHERE %s func (r *Risks) LoadByMeasureID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, measureID gid.GID, cursor *page.Cursor[RiskOrderField], @@ -229,7 +229,7 @@ WHERE %s func (r *Risks) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *RiskFilter, @@ -260,7 +260,7 @@ WHERE %s func (r *Risks) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[RiskOrderField], @@ -347,7 +347,7 @@ WHERE %s func (r *Risk) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, riskID gid.GID, ) error { @@ -403,7 +403,7 @@ LIMIT 1; func (r *Risks) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, riskIDs []gid.GID, ) error { @@ -454,7 +454,7 @@ WHERE %s func (r *Risk) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -486,7 +486,7 @@ VALUES (@id, @tenant_id, @organization_id, @name, @description, @category, @owne func (r *Risk) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -531,7 +531,7 @@ WHERE %s func (r *Risk) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, riskID gid.GID, ) error { @@ -549,7 +549,7 @@ DELETE FROM risks WHERE %s AND id = @id AND snapshot_id IS NULL func (r *Risks) CountByDocumentID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, documentID gid.GID, filter *RiskFilter, @@ -591,7 +591,7 @@ WHERE %s return count, nil } -func (r Risks) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error { +func (r Risks) Snapshot(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error { if err := r.InsertRiskSnapshots(ctx, conn, scope, organizationID, snapshotID); err != nil { return fmt.Errorf("cannot create risk snapshots: %w", err) } @@ -601,7 +601,7 @@ func (r Risks) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organiz func (r Risks) InsertRiskSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/risk_document.go b/pkg/coredata/risk_document.go index c26329159..55a4e7f25 100644 --- a/pkg/coredata/risk_document.go +++ b/pkg/coredata/risk_document.go @@ -39,7 +39,7 @@ type ( func (rp RiskDocument) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -73,7 +73,7 @@ VALUES ( func (rp RiskDocument) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, riskID gid.GID, documentID gid.GID, @@ -102,7 +102,7 @@ WHERE func (rp RiskDocument) DeleteByDocumentIDs( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, documentIDs []gid.GID, ) error { diff --git a/pkg/coredata/risk_mesure.go b/pkg/coredata/risk_mesure.go index 8f732909c..b757fb6c2 100644 --- a/pkg/coredata/risk_mesure.go +++ b/pkg/coredata/risk_mesure.go @@ -39,7 +39,7 @@ type ( func (rm RiskMeasure) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -73,7 +73,7 @@ VALUES ( func (rm RiskMeasure) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, riskID gid.GID, measureID gid.GID, diff --git a/pkg/coredata/risk_obligation.go b/pkg/coredata/risk_obligation.go index a311bd9e7..699627369 100644 --- a/pkg/coredata/risk_obligation.go +++ b/pkg/coredata/risk_obligation.go @@ -38,7 +38,7 @@ type ( func (ro RiskObligation) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -75,7 +75,7 @@ INSERT INTO risks_obligations ( func (ro RiskObligation) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/saml_assertion.go b/pkg/coredata/saml_assertion.go index 5147e6ef8..7a0af0263 100644 --- a/pkg/coredata/saml_assertion.go +++ b/pkg/coredata/saml_assertion.go @@ -35,7 +35,7 @@ type SAMLAssertion struct { func (s *SAMLAssertion) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { query := ` INSERT INTO iam_saml_assertions (id, organization_id, used_at, expires_at) @@ -62,7 +62,7 @@ VALUES (@id, @organization_id, @used_at, @expires_at) return nil } -func DeleteExpiredSAMLAssertions(ctx context.Context, conn pg.Conn, now time.Time) (int64, error) { +func DeleteExpiredSAMLAssertions(ctx context.Context, conn pg.Tx, now time.Time) (int64, error) { query := ` DELETE FROM iam_saml_assertions WHERE expires_at < @now diff --git a/pkg/coredata/saml_configuration.go b/pkg/coredata/saml_configuration.go index 439e4f0c9..399f8d416 100644 --- a/pkg/coredata/saml_configuration.go +++ b/pkg/coredata/saml_configuration.go @@ -63,7 +63,7 @@ func (s *SAMLConfiguration) CursorKey(orderBy SAMLConfigurationOrderField) page. panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (s *SAMLConfiguration) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (s *SAMLConfiguration) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM iam_saml_configurations WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -93,7 +93,7 @@ func (s *SAMLConfiguration) GetIdPCertificate() (*x509.Certificate, error) { func (s *SAMLConfiguration) LoadByOrganizationIDAndEmailDomain( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, emailDomain string, @@ -155,7 +155,7 @@ LIMIT 1; func (s *SAMLConfiguration) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, configID gid.GID, ) error { @@ -212,7 +212,7 @@ LIMIT 1; func (s *SAMLConfiguration) LoadByIDForUpdateSkipLocked( ctx context.Context, - conn pg.Conn, + conn pg.Tx, configID gid.GID, ) error { q := ` @@ -264,7 +264,7 @@ FOR UPDATE SKIP LOCKED; func (s *SAMLConfiguration) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -347,7 +347,7 @@ INSERT INTO iam_saml_configurations ( func (s *SAMLConfiguration) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -402,7 +402,7 @@ WHERE func (s *SAMLConfiguration) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -427,7 +427,7 @@ WHERE func (s *SAMLConfigurations) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) error { @@ -480,7 +480,7 @@ ORDER BY email_domain ASC; func (s *SAMLConfigurations) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -513,7 +513,7 @@ WHERE return count, nil } -func (s *SAMLConfigurations) LoadVerifiedByEmailDomain(ctx context.Context, conn pg.Conn, emailDomain string) error { +func (s *SAMLConfigurations) LoadVerifiedByEmailDomain(ctx context.Context, conn pg.Querier, emailDomain string) error { q := ` SELECT id, @@ -558,7 +558,7 @@ ORDER BY email_domain ASC; func (s *SAMLConfigurations) CountVerifiedByEmailDomain( ctx context.Context, - conn pg.Conn, + conn pg.Querier, emailDomain string, ) (int, error) { q := ` @@ -582,7 +582,7 @@ WHERE func (s *SAMLConfigurations) LoadUnverified( ctx context.Context, - conn pg.Conn, + conn pg.Querier, ) error { q := ` SELECT diff --git a/pkg/coredata/saml_request.go b/pkg/coredata/saml_request.go index e2207edff..477987887 100644 --- a/pkg/coredata/saml_request.go +++ b/pkg/coredata/saml_request.go @@ -33,7 +33,7 @@ type SAMLRequest struct { func (s *SAMLRequest) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { query := ` INSERT INTO iam_saml_requests (id, organization_id, created_at, expires_at) @@ -57,7 +57,7 @@ VALUES (@id, @organization_id, @created_at, @expires_at) func LoadValidRequestIDsForOrganization( ctx context.Context, - conn pg.Conn, + conn pg.Querier, organizationID gid.GID, now time.Time, ) ([]string, error) { @@ -89,7 +89,7 @@ WHERE organization_id = @organization_id AND expires_at > @now return requestIDs, nil } -func DeleteExpiredSAMLRequests(ctx context.Context, conn pg.Conn, now time.Time) (int64, error) { +func DeleteExpiredSAMLRequests(ctx context.Context, conn pg.Tx, now time.Time) (int64, error) { query := ` DELETE FROM iam_saml_requests WHERE expires_at < @now diff --git a/pkg/coredata/scim_bridge.go b/pkg/coredata/scim_bridge.go index 8bf5054f0..bcfcb6775 100644 --- a/pkg/coredata/scim_bridge.go +++ b/pkg/coredata/scim_bridge.go @@ -60,7 +60,7 @@ func (s *SCIMBridge) CursorKey(orderBy SCIMBridgeOrderField) page.CursorKey { panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (s *SCIMBridge) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (s *SCIMBridge) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM iam_scim_bridges WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -76,7 +76,7 @@ func (s *SCIMBridge) AuthorizationAttributes(ctx context.Context, conn pg.Conn) func (s *SCIMBridge) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, bridgeID gid.GID, ) error { @@ -131,7 +131,7 @@ LIMIT 1; func (s *SCIMBridge) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) error { @@ -186,7 +186,7 @@ LIMIT 1; func (s *SCIMBridge) LoadBySCIMConfigurationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, scimConfigurationID gid.GID, ) error { @@ -241,7 +241,7 @@ LIMIT 1; func (s *SCIMBridge) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -311,7 +311,7 @@ INSERT INTO iam_scim_bridges ( func (s *SCIMBridge) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -360,7 +360,7 @@ WHERE func (s *SCIMBridge) LoadNextForSyncSkipLocked( ctx context.Context, - conn pg.Conn, + conn pg.Querier, staleSyncThreshold time.Duration, ) error { staleCutoff := time.Now().Add(-staleSyncThreshold) @@ -418,7 +418,7 @@ FOR UPDATE SKIP LOCKED func (s *SCIMBridge) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/scim_configuration.go b/pkg/coredata/scim_configuration.go index 2889d5b8e..82a3a69cb 100644 --- a/pkg/coredata/scim_configuration.go +++ b/pkg/coredata/scim_configuration.go @@ -50,7 +50,7 @@ func (s *SCIMConfiguration) CursorKey(orderBy SCIMConfigurationOrderField) page. panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (s *SCIMConfiguration) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (s *SCIMConfiguration) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM iam_scim_configurations WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -66,7 +66,7 @@ func (s *SCIMConfiguration) AuthorizationAttributes(ctx context.Context, conn pg func (s *SCIMConfiguration) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, configID gid.GID, ) error { @@ -124,7 +124,7 @@ LEFT JOIN func (s *SCIMConfiguration) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) error { @@ -182,7 +182,7 @@ LEFT JOIN func (s *SCIMConfiguration) LoadByHashedToken( ctx context.Context, - conn pg.Conn, + conn pg.Querier, hashedToken []byte, ) error { q := ` @@ -235,7 +235,7 @@ LEFT JOIN func (s *SCIMConfiguration) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -282,7 +282,7 @@ INSERT INTO iam_scim_configurations ( func (s *SCIMConfiguration) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -315,7 +315,7 @@ WHERE func (s *SCIMConfiguration) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/scim_event.go b/pkg/coredata/scim_event.go index c0a829502..a5e8fa32e 100644 --- a/pkg/coredata/scim_event.go +++ b/pkg/coredata/scim_event.go @@ -56,7 +56,7 @@ func (s *SCIMEvent) CursorKey(orderBy SCIMEventOrderField) page.CursorKey { panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (s *SCIMEvent) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (s *SCIMEvent) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM iam_scim_events WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -72,7 +72,7 @@ func (s *SCIMEvent) AuthorizationAttributes(ctx context.Context, conn pg.Conn) ( func (s *SCIMEvent) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, eventID gid.GID, ) error { @@ -124,7 +124,7 @@ LIMIT 1; func (s *SCIMEvent) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -185,7 +185,7 @@ INSERT INTO iam_scim_events ( func (s *SCIMEvents) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[SCIMEventOrderField], @@ -235,7 +235,7 @@ WHERE func (s *SCIMEvents) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -265,7 +265,7 @@ WHERE func (s *SCIMEvents) LoadBySCIMConfigurationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, scimConfigurationID gid.GID, cursor *page.Cursor[SCIMEventOrderField], @@ -315,7 +315,7 @@ WHERE func (s *SCIMEvents) CountBySCIMConfigurationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, scimConfigurationID gid.GID, ) (int, error) { diff --git a/pkg/coredata/session.go b/pkg/coredata/session.go index e4bfb01c4..2c80cf475 100644 --- a/pkg/coredata/session.go +++ b/pkg/coredata/session.go @@ -96,7 +96,7 @@ func (s *Session) IsChildSession() bool { func (s *Session) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, sessionID gid.GID, ) error { q := ` @@ -144,7 +144,7 @@ LIMIT 1; // AuthorizationAttributes loads the minimal authorization attributes for policy condition evaluation. // It is intentionally lightweight and does not populate the Session struct. -func (s *Session) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (s *Session) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := ` SELECT identity_id @@ -168,7 +168,7 @@ LIMIT 1; func (s *Session) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` INSERT INTO @@ -214,7 +214,7 @@ VALUES ( func (s *Session) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` UPDATE iam_sessions @@ -251,7 +251,7 @@ WHERE return nil } -func (s *Sessions) LoadByIdentityID(ctx context.Context, conn pg.Conn, identityID gid.GID, cursor *page.Cursor[SessionOrderField]) error { +func (s *Sessions) LoadByIdentityID(ctx context.Context, conn pg.Querier, identityID gid.GID, cursor *page.Cursor[SessionOrderField]) error { q := ` SELECT id, @@ -295,7 +295,7 @@ WHERE return nil } -func (s *Sessions) CountByIdentityID(ctx context.Context, conn pg.Conn, identityID gid.GID) (int, error) { +func (s *Sessions) CountByIdentityID(ctx context.Context, conn pg.Querier, identityID gid.GID) (int, error) { q := ` SELECT COUNT(*) @@ -317,7 +317,7 @@ WHERE return count, nil } -func (s *Sessions) ExpireAllForIdentityExceptOneSession(ctx context.Context, conn pg.Conn, identityID gid.GID, sessionID gid.GID) (int64, error) { +func (s *Sessions) ExpireAllForIdentityExceptOneSession(ctx context.Context, conn pg.Querier, identityID gid.GID, sessionID gid.GID) (int64, error) { q := ` UPDATE iam_sessions SET @@ -345,7 +345,7 @@ WHERE func (s *Session) LoadByRootSessionIDAndMembershipID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, rootSessionID gid.GID, membershipID gid.GID, ) error { diff --git a/pkg/coredata/slack_message.go b/pkg/coredata/slack_message.go index dfba0d404..df3fa4526 100644 --- a/pkg/coredata/slack_message.go +++ b/pkg/coredata/slack_message.go @@ -57,7 +57,7 @@ func (e ErrSlackMessageNotFound) Error() string { return "slack message not found" } -func (sm *SlackMessage) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (sm *SlackMessage) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM slack_messages WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -92,7 +92,7 @@ func NewSlackMessage( func (s *SlackMessage) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -151,7 +151,7 @@ VALUES ( func (s *SlackMessage) LoadNextUnsentForUpdate( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT id, organization_id, type, body, message_ts, channel_id, requester_email, metadata, initial_slack_message_id, created_at, updated_at, sent_at, error @@ -183,7 +183,7 @@ FOR UPDATE func (s *SlackMessage) LoadNextInitalUnsentForUpdate( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT id, organization_id, type, body, message_ts, channel_id, requester_email, metadata, initial_slack_message_id, created_at, updated_at, sent_at, error @@ -215,7 +215,7 @@ FOR UPDATE func (s *SlackMessage) LoadNextUpdateUnsentForUpdate( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT @@ -265,7 +265,7 @@ FOR UPDATE OF sm func (s *SlackMessage) LoadInitialByChannelAndTS( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, channelID string, messageTS string, @@ -305,7 +305,7 @@ LIMIT 1 func (s *SlackMessage) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -335,7 +335,7 @@ WHERE id = @id AND %s func (s *SlackMessage) UpdateChannelAndTSByInitialMessageID( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, initialSlackMessageID gid.GID, channelID string, @@ -369,7 +369,7 @@ WHERE initial_slack_message_id = @initial_slack_message_id AND %s func (s *SlackMessage) LoadById( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, slackMessageID gid.GID, ) error { @@ -408,7 +408,7 @@ LIMIT 1 func (s *SlackMessage) LoadLatestByInitialMessageID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, initialSlackMessageID gid.GID, ) error { @@ -448,7 +448,7 @@ LIMIT 1 func (s *SlackMessage) LoadLatestByRequesterEmailAndType( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, requesterEmail mail.Addr, diff --git a/pkg/coredata/snapshot.go b/pkg/coredata/snapshot.go index b3d35deb3..3c0a8d94a 100644 --- a/pkg/coredata/snapshot.go +++ b/pkg/coredata/snapshot.go @@ -53,7 +53,7 @@ func (s *Snapshot) CursorKey(field SnapshotOrderField) page.CursorKey { panic(fmt.Sprintf("unsupported order by: %s", field)) } -func (s *Snapshot) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (s *Snapshot) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM snapshots WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -69,7 +69,7 @@ func (s *Snapshot) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (m func (s *Snapshot) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, snapshotID gid.GID, ) error { @@ -111,7 +111,7 @@ LIMIT 1; func (s *Snapshots) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *SnapshotFilter, @@ -145,7 +145,7 @@ WHERE func (s *Snapshots) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[SnapshotOrderField], @@ -189,7 +189,7 @@ WHERE func (s *Snapshot) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -232,7 +232,7 @@ INSERT INTO snapshots ( func (s *Snapshot) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -258,7 +258,7 @@ WHERE func (s *Snapshots) LoadByControlID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, controlID gid.GID, cursor *page.Cursor[SnapshotOrderField], diff --git a/pkg/coredata/snapshottable.go b/pkg/coredata/snapshottable.go index 9f62123b3..6cea656d4 100644 --- a/pkg/coredata/snapshottable.go +++ b/pkg/coredata/snapshottable.go @@ -23,7 +23,7 @@ import ( ) type Snapshottable interface { - Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error + Snapshot(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error } func GetSnapshottable(snapshotType SnapshotsType) (Snapshottable, error) { diff --git a/pkg/coredata/state_of_applicability.go b/pkg/coredata/state_of_applicability.go index a83c81c6c..60b9aa0cd 100644 --- a/pkg/coredata/state_of_applicability.go +++ b/pkg/coredata/state_of_applicability.go @@ -54,7 +54,7 @@ func (s StateOfApplicability) CursorKey(orderBy StateOfApplicabilityOrderField) panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (s *StateOfApplicability) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (s *StateOfApplicability) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM states_of_applicability WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -70,7 +70,7 @@ func (s *StateOfApplicability) AuthorizationAttributes(ctx context.Context, conn func (s *StateOfApplicability) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, stateOfApplicabilityID gid.GID, ) error { @@ -117,7 +117,7 @@ LIMIT 1; func (s *StatesOfApplicability) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[StateOfApplicabilityOrderField], @@ -164,7 +164,7 @@ WHERE func (s *StatesOfApplicability) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *StateOfApplicabilityFilter, @@ -198,7 +198,7 @@ WHERE func (s *StateOfApplicability) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -255,7 +255,7 @@ VALUES ( func (s *StateOfApplicability) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -299,7 +299,7 @@ WHERE func (s *StateOfApplicability) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -327,7 +327,7 @@ WHERE return nil } -func (soas StatesOfApplicability) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error { +func (soas StatesOfApplicability) Snapshot(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error { if err := soas.insertStateOfApplicabilitySnapshots(ctx, conn, scope, organizationID, snapshotID); err != nil { return fmt.Errorf("cannot insert state_of_applicability snapshots: %w", err) } @@ -341,7 +341,7 @@ func (soas StatesOfApplicability) Snapshot(ctx context.Context, conn pg.Conn, sc func (soas StatesOfApplicability) insertStateOfApplicabilitySnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, snapshotID gid.GID, @@ -395,7 +395,7 @@ WHERE func (soas StatesOfApplicability) insertStateOfApplicabilityControlSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/task.go b/pkg/coredata/task.go index e43547a30..e54236688 100644 --- a/pkg/coredata/task.go +++ b/pkg/coredata/task.go @@ -64,7 +64,7 @@ func (t Task) CursorKey(orderBy TaskOrderField) page.CursorKey { panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (t *Task) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (t *Task) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM tasks WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -80,7 +80,7 @@ func (t *Task) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[s func (t *Task) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, taskID gid.GID, ) error { @@ -135,7 +135,7 @@ LIMIT 1; func (t *Tasks) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, taskIDs []gid.GID, ) error { @@ -185,7 +185,7 @@ WHERE func (t *Task) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -265,7 +265,7 @@ RETURNING rank, priority_rank; func (t *Task) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -365,7 +365,7 @@ RETURNING func (t *Tasks) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -397,7 +397,7 @@ func (t *Tasks) CountByOrganizationID( func (t *Tasks) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[TaskOrderField], @@ -449,7 +449,7 @@ func (t *Tasks) LoadByOrganizationID( func (t *Tasks) CountByMeasureID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, measureID gid.GID, ) (int, error) { @@ -481,7 +481,7 @@ WHERE func (t *Tasks) LoadByMeasureID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, measureID gid.GID, cursor *page.Cursor[TaskOrderField], @@ -533,7 +533,7 @@ WHERE func (t *Task) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -574,7 +574,7 @@ WHERE %s func (t *Task) NextRankForStatePriority( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -613,7 +613,7 @@ WHERE func (t *Task) UpdateRank( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -668,7 +668,7 @@ WHERE %s func (t *Task) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/token.go b/pkg/coredata/token.go index 9c4cd16c5..be2d09f73 100644 --- a/pkg/coredata/token.go +++ b/pkg/coredata/token.go @@ -34,7 +34,7 @@ type Token struct { func (t *Token) LoadByHashedValueForUpdate( ctx context.Context, - conn pg.Conn, + conn pg.Tx, hashedValue []byte, ) error { q := ` @@ -72,7 +72,7 @@ FOR UPDATE; func (t *Token) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` INSERT INTO iam_tokens( @@ -109,7 +109,7 @@ INSERT INTO iam_tokens( func (t *Token) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` DELETE FROM iam_tokens diff --git a/pkg/coredata/transfer_impact_assessment.go b/pkg/coredata/transfer_impact_assessment.go index f3dcab232..044938846 100644 --- a/pkg/coredata/transfer_impact_assessment.go +++ b/pkg/coredata/transfer_impact_assessment.go @@ -56,7 +56,7 @@ func (tia *TransferImpactAssessment) CursorKey(field TransferImpactAssessmentOrd panic(fmt.Sprintf("unsupported order by: %s", field)) } -func (tia *TransferImpactAssessment) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (tia *TransferImpactAssessment) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM processing_activity_transfer_impact_assessments WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -73,7 +73,7 @@ func (tia *TransferImpactAssessment) AuthorizationAttributes(ctx context.Context func (tias *TransferImpactAssessments) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *TransferImpactAssessmentFilter, @@ -108,7 +108,7 @@ WHERE func (tias *TransferImpactAssessments) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[TransferImpactAssessmentOrderField], @@ -161,7 +161,7 @@ WHERE func (tias *TransferImpactAssessments) LoadAllByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *TransferImpactAssessmentFilter, @@ -211,7 +211,7 @@ WHERE func (tia *TransferImpactAssessment) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, tiaID gid.GID, ) error { @@ -262,7 +262,7 @@ LIMIT 1; func (tia *TransferImpactAssessment) LoadByProcessingActivityID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, processingActivityID gid.GID, ) error { @@ -313,7 +313,7 @@ LIMIT 1; func (tia *TransferImpactAssessment) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -375,7 +375,7 @@ INSERT INTO processing_activity_transfer_impact_assessments ( func (tia *TransferImpactAssessment) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -414,7 +414,7 @@ WHERE func (tia *TransferImpactAssessment) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -439,7 +439,7 @@ WHERE func (tias TransferImpactAssessments) InsertProcessingActivitySnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/trust_center.go b/pkg/coredata/trust_center.go index f15be769b..55babc629 100644 --- a/pkg/coredata/trust_center.go +++ b/pkg/coredata/trust_center.go @@ -56,7 +56,7 @@ func (tc *TrustCenter) CursorKey(orderBy TrustCenterOrderField) page.CursorKey { panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (tc *TrustCenter) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (tc *TrustCenter) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM trust_centers WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -72,7 +72,7 @@ func (tc *TrustCenter) AuthorizationAttributes(ctx context.Context, conn pg.Conn func (tc *TrustCenter) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterID gid.GID, ) error { @@ -124,7 +124,7 @@ LIMIT 1; func (tc *TrustCenter) LoadByMailingListID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, mailingListID gid.GID, ) error { @@ -176,7 +176,7 @@ LIMIT 1; func (tc *TrustCenter) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) error { @@ -229,7 +229,7 @@ LIMIT 1; // Tenant id scope is not applied because we want to access trust centers by slug across all tenants for public access. func (tc *TrustCenter) LoadBySlug( ctx context.Context, - conn pg.Conn, + conn pg.Querier, slug string, ) error { q := ` @@ -276,7 +276,7 @@ LIMIT 1; func (tc *TrustCenter) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -340,7 +340,7 @@ INSERT INTO trust_centers ( func (tc *TrustCenter) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/trust_center_access.go b/pkg/coredata/trust_center_access.go index b3494f553..f2718c845 100644 --- a/pkg/coredata/trust_center_access.go +++ b/pkg/coredata/trust_center_access.go @@ -52,7 +52,7 @@ func (tca *TrustCenterAccess) CursorKey(orderBy TrustCenterAccessOrderField) pag panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (tca *TrustCenterAccess) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (tca *TrustCenterAccess) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM trust_center_accesses WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -68,7 +68,7 @@ func (tca *TrustCenterAccess) AuthorizationAttributes(ctx context.Context, conn func (tca *TrustCenterAccess) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, accessID gid.GID, ) error { @@ -116,7 +116,7 @@ LIMIT 1; func (tca *TrustCenterAccess) LoadByTrustCenterIDAndIdentityID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterID gid.GID, identityID gid.GID, @@ -169,7 +169,7 @@ LIMIT 1; func (tca *TrustCenterAccess) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -221,7 +221,7 @@ INSERT INTO trust_center_accesses ( func (tca *TrustCenterAccess) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -252,7 +252,7 @@ WHERE func (tca *TrustCenterAccess) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -279,7 +279,7 @@ WHERE func (tcas *TrustCenterAccesses) LoadByTrustCenterID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterID gid.GID, cursor *page.Cursor[TrustCenterAccessOrderField], diff --git a/pkg/coredata/trust_center_document_access.go b/pkg/coredata/trust_center_document_access.go index 8beda53ac..40a38d367 100644 --- a/pkg/coredata/trust_center_document_access.go +++ b/pkg/coredata/trust_center_document_access.go @@ -53,7 +53,7 @@ func (tcda *TrustCenterDocumentAccess) CursorKey(orderBy TrustCenterDocumentAcce panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (tcda *TrustCenterDocumentAccess) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (tcda *TrustCenterDocumentAccess) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM trust_center_document_accesses WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -69,7 +69,7 @@ func (tcda *TrustCenterDocumentAccess) AuthorizationAttributes(ctx context.Conte func (tcda *TrustCenterDocumentAccess) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, accessID gid.GID, ) error { @@ -117,7 +117,7 @@ LIMIT 1; func (tcda *TrustCenterDocumentAccess) LoadByTrustCenterAccessIDAndDocumentID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, documentID gid.GID, @@ -171,7 +171,7 @@ LIMIT 1; func (tcda *TrustCenterDocumentAccess) LoadByTrustCenterAccessIDAndReportID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, reportID gid.GID, @@ -225,7 +225,7 @@ LIMIT 1; func (tcda *TrustCenterDocumentAccess) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -288,7 +288,7 @@ INSERT INTO trust_center_document_accesses ( func (tcda *TrustCenterDocumentAccess) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -319,7 +319,7 @@ WHERE func (tcda *TrustCenterDocumentAccess) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -346,7 +346,7 @@ WHERE func (tcdas *TrustCenterDocumentAccesses) CountByTrustCenterAccessID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, ) (int, error) { @@ -379,7 +379,7 @@ WHERE func (tcdas *TrustCenterDocumentAccesses) CountPendingRequestByTrustCenterAccessID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, ) (int, error) { @@ -413,7 +413,7 @@ WHERE func (tcdas *TrustCenterDocumentAccesses) CountActiveByTrustCenterAccessID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, ) (int, error) { @@ -447,7 +447,7 @@ WHERE func (tcdas *TrustCenterDocumentAccesses) LoadAvailableByTrustCenterAccessID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, cursor *page.Cursor[TrustCenterDocumentAccessOrderField], @@ -569,7 +569,7 @@ WHERE %s func (tcdas *TrustCenterDocumentAccesses) LoadAllByTrustCenterAccessID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, ) error { @@ -616,7 +616,7 @@ ORDER BY id ASC func GrantByDocumentIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, documentIDs []gid.GID, @@ -650,7 +650,7 @@ WHERE func RejectOrRevokeByDocumentIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, documentIDs []gid.GID, @@ -689,7 +689,7 @@ WHERE func GrantByReportIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, reportIDs []gid.GID, @@ -723,7 +723,7 @@ WHERE func RejectOrRevokeByReportIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, reportIDs []gid.GID, @@ -767,7 +767,7 @@ type MergeTrustCenterDocumentAccessesData struct { func (tcdas TrustCenterDocumentAccesses) MergeDocumentAccesses( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, trustCenterAccessID gid.GID, @@ -840,7 +840,7 @@ WHEN NOT MATCHED func (tcdas TrustCenterDocumentAccesses) BulkInsertDocumentAccesses( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, organizationID gid.GID, @@ -902,7 +902,7 @@ ON CONFLICT DO NOTHING func (tcdas TrustCenterDocumentAccesses) MergeReportAccesses( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, trustCenterAccessID gid.GID, @@ -975,7 +975,7 @@ WHEN NOT MATCHED func (tcdas TrustCenterDocumentAccesses) BulkInsertReportAccesses( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, organizationID gid.GID, @@ -1037,7 +1037,7 @@ ON CONFLICT DO NOTHING func (tcda *TrustCenterDocumentAccess) LoadByTrustCenterAccessIDAndTrustCenterFileID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, trustCenterFileID gid.GID, @@ -1091,7 +1091,7 @@ LIMIT 1; func GrantByTrustCenterFileIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, trustCenterFileIDs []gid.GID, @@ -1125,7 +1125,7 @@ WHERE func RejectOrRevokeByTrustCenterFileIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, trustCenterFileIDs []gid.GID, @@ -1164,7 +1164,7 @@ WHERE func (tcdas TrustCenterDocumentAccesses) MergeTrustCenterFileAccesses( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, trustCenterAccessID gid.GID, @@ -1237,7 +1237,7 @@ WHEN NOT MATCHED func (tcdas TrustCenterDocumentAccesses) BulkInsertTrustCenterFileAccesses( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterAccessID gid.GID, organizationID gid.GID, diff --git a/pkg/coredata/trust_center_file.go b/pkg/coredata/trust_center_file.go index a07140958..5186d105b 100644 --- a/pkg/coredata/trust_center_file.go +++ b/pkg/coredata/trust_center_file.go @@ -54,7 +54,7 @@ func (t TrustCenterFile) CursorKey(orderBy TrustCenterFileOrderField) page.Curso panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (t *TrustCenterFile) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (t *TrustCenterFile) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM trust_center_files WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -70,7 +70,7 @@ func (t *TrustCenterFile) AuthorizationAttributes(ctx context.Context, conn pg.C func (t *TrustCenterFile) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterFileID gid.GID, ) error { @@ -113,7 +113,7 @@ LIMIT 1; func (f *TrustCenterFiles) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterFileIDs []gid.GID, ) error { @@ -157,7 +157,7 @@ WHERE func (t TrustCenterFile) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -208,7 +208,7 @@ VALUES ( func (t *TrustCenterFile) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -260,7 +260,7 @@ RETURNING func (t *TrustCenterFile) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -286,7 +286,7 @@ WHERE func (t *TrustCenterFiles) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[TrustCenterFileOrderField], @@ -335,7 +335,7 @@ WHERE func (t *TrustCenterFiles) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -365,7 +365,7 @@ WHERE func (t *TrustCenterFiles) LoadAllByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *TrustCenterFileFilter, diff --git a/pkg/coredata/trust_center_reference.go b/pkg/coredata/trust_center_reference.go index 8e3bc9686..d683f6e32 100644 --- a/pkg/coredata/trust_center_reference.go +++ b/pkg/coredata/trust_center_reference.go @@ -59,7 +59,7 @@ func (t TrustCenterReference) CursorKey(orderBy TrustCenterReferenceOrderField) panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (t *TrustCenterReference) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (t *TrustCenterReference) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM trust_center_references WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -75,7 +75,7 @@ func (t *TrustCenterReference) AuthorizationAttributes(ctx context.Context, conn func (t *TrustCenterReference) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterReferenceID gid.GID, ) error { @@ -120,7 +120,7 @@ LIMIT 1; func (t *TrustCenterReference) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -183,7 +183,7 @@ RETURNING rank; func (t *TrustCenterReference) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -225,7 +225,7 @@ WHERE func (t *TrustCenterReference) UpdateRank( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -275,7 +275,7 @@ WHERE %s func (t *TrustCenterReference) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -301,7 +301,7 @@ WHERE func (t *TrustCenterReferences) LoadByTrustCenterID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterID gid.GID, cursor *page.Cursor[TrustCenterReferenceOrderField], @@ -349,7 +349,7 @@ WHERE func (t *TrustCenterReferences) CountByTrustCenterID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, trustCenterID gid.GID, ) (int, error) { diff --git a/pkg/coredata/vendor.go b/pkg/coredata/vendor.go index 7d8056708..21c302f92 100644 --- a/pkg/coredata/vendor.go +++ b/pkg/coredata/vendor.go @@ -61,7 +61,7 @@ type ( Vendors []*Vendor VendorSnapshotter interface { - InsertVendorSnapshots(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error + InsertVendorSnapshots(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error } ) @@ -78,7 +78,7 @@ func (v Vendor) CursorKey(orderBy VendorOrderField) page.CursorKey { panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (v *Vendor) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (v *Vendor) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM vendors WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -94,7 +94,7 @@ func (v *Vendor) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map func (v *Vendor) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorID gid.GID, ) error { @@ -162,7 +162,7 @@ LIMIT 1; func (v *Vendors) LoadByIDs( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorIDs []gid.GID, ) error { @@ -224,7 +224,7 @@ WHERE func (v Vendor) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -324,7 +324,7 @@ VALUES ( func (v Vendor) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -342,7 +342,7 @@ DELETE FROM vendors WHERE %s AND id = @vendor_id func (v *Vendors) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *VendorFilter, @@ -377,7 +377,7 @@ WHERE func (v *Vendors) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[VendorOrderField], @@ -444,7 +444,7 @@ WHERE func (v *Vendor) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -509,7 +509,7 @@ WHERE %s func (v Vendor) ExpireNonExpiredRiskAssessments( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { now := time.Now() @@ -543,7 +543,7 @@ func (v Vendor) ExpireNonExpiredRiskAssessments( func (v *Vendors) CountByAssetID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, assetID gid.GID, ) (int, error) { @@ -582,7 +582,7 @@ WHERE %s func (v *Vendors) LoadByAssetID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, assetID gid.GID, cursor *page.Cursor[VendorOrderField], @@ -680,7 +680,7 @@ WHERE %s func (v *Vendors) CountByDatumID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, datumID gid.GID, ) (int, error) { @@ -719,7 +719,7 @@ WHERE %s func (vs *Vendors) LoadByDatumID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, datumID gid.GID, cursor *page.Cursor[VendorOrderField], @@ -817,7 +817,7 @@ WHERE %s func (v *Vendors) LoadByProcessingActivityID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, processingActivityID gid.GID, cursor *page.Cursor[VendorOrderField], @@ -915,7 +915,7 @@ WHERE %s func (v *Vendors) LoadAllByProcessingActivities( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, filter *ProcessingActivityFilter, @@ -983,7 +983,7 @@ ORDER BY func (d Vendors) InsertDataSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, @@ -1085,7 +1085,7 @@ FROM source_vendors v func (vs Vendors) InsertAssetSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, @@ -1187,7 +1187,7 @@ FROM source_vendors v func (vs Vendors) InsertProcessingActivitySnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, @@ -1287,7 +1287,7 @@ FROM source_vendors v return nil } -func (v Vendors) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organizationID, snapshotID gid.GID) error { +func (v Vendors) Snapshot(ctx context.Context, conn pg.Tx, scope Scoper, organizationID, snapshotID gid.GID) error { for _, snapshotter := range []VendorSnapshotter{ Vendors{}, VendorServices{}, @@ -1307,7 +1307,7 @@ func (v Vendors) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organ func (v Vendors) InsertVendorSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/vendor_business_associate_agreement.go b/pkg/coredata/vendor_business_associate_agreement.go index a4ef73dac..e8db2f8d6 100644 --- a/pkg/coredata/vendor_business_associate_agreement.go +++ b/pkg/coredata/vendor_business_associate_agreement.go @@ -56,7 +56,7 @@ func (v VendorBusinessAssociateAgreement) CursorKey(orderBy VendorBusinessAssoci panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (vbaa *VendorBusinessAssociateAgreement) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (vbaa *VendorBusinessAssociateAgreement) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM vendor_business_associate_agreements WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -72,7 +72,7 @@ func (vbaa *VendorBusinessAssociateAgreement) AuthorizationAttributes(ctx contex func (vbaa *VendorBusinessAssociateAgreement) LoadByVendorID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorID gid.GID, ) error { @@ -118,7 +118,7 @@ LIMIT 1; func (vbaa *VendorBusinessAssociateAgreement) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorBusinessAssociateAgreementID gid.GID, ) error { @@ -164,7 +164,7 @@ LIMIT 1; func (vbaa *VendorBusinessAssociateAgreement) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -202,7 +202,7 @@ WHERE func (vbaa *VendorBusinessAssociateAgreement) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -271,7 +271,7 @@ ON CONFLICT (organization_id, vendor_id) DO UPDATE SET func (vbaa *VendorBusinessAssociateAgreement) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -295,7 +295,7 @@ WHERE func (vbaa *VendorBusinessAssociateAgreement) DeleteByVendorID( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, vendorID gid.GID, ) error { @@ -320,7 +320,7 @@ WHERE func (v VendorBusinessAssociateAgreements) InsertVendorSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/vendor_compliance_report.go b/pkg/coredata/vendor_compliance_report.go index a5fdf6dd5..49936600b 100644 --- a/pkg/coredata/vendor_compliance_report.go +++ b/pkg/coredata/vendor_compliance_report.go @@ -56,7 +56,7 @@ func (c VendorComplianceReport) CursorKey(orderBy VendorComplianceReportOrderFie panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (v *VendorComplianceReport) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (v *VendorComplianceReport) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM vendor_compliance_reports WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -72,7 +72,7 @@ func (v *VendorComplianceReport) AuthorizationAttributes(ctx context.Context, co func (vcs *VendorComplianceReports) LoadForVendorID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorID gid.GID, cursor *page.Cursor[VendorComplianceReportOrderField], @@ -121,7 +121,7 @@ WHERE func (vcr *VendorComplianceReport) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorComplianceReportID gid.GID, ) error { @@ -168,7 +168,7 @@ LIMIT 1; func (vcr *VendorComplianceReport) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -217,7 +217,7 @@ VALUES ( func (vcr *VendorComplianceReport) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -254,7 +254,7 @@ RETURNING report_file_id func (vcrs VendorComplianceReports) InsertVendorSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/vendor_contact.go b/pkg/coredata/vendor_contact.go index 2a67fd5b0..38caced57 100644 --- a/pkg/coredata/vendor_contact.go +++ b/pkg/coredata/vendor_contact.go @@ -59,7 +59,7 @@ func (vc VendorContact) CursorKey(orderBy VendorContactOrderField) page.CursorKe panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (vc *VendorContact) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (vc *VendorContact) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM vendor_contacts WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -75,7 +75,7 @@ func (vc *VendorContact) AuthorizationAttributes(ctx context.Context, conn pg.Co func (vc *VendorContact) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorContactID gid.GID, ) error { @@ -127,7 +127,7 @@ LIMIT 1; func (vc *VendorContacts) LoadByVendorID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorID gid.GID, cursor *page.Cursor[VendorContactOrderField], @@ -178,7 +178,7 @@ WHERE func (vc VendorContact) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -232,7 +232,7 @@ VALUES ( func (vc VendorContact) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -272,7 +272,7 @@ WHERE func (vc VendorContact) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -299,7 +299,7 @@ WHERE func (vc VendorContacts) InsertVendorSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/vendor_data_privacy_agreement.go b/pkg/coredata/vendor_data_privacy_agreement.go index a8d41ac7e..3ee4e861a 100644 --- a/pkg/coredata/vendor_data_privacy_agreement.go +++ b/pkg/coredata/vendor_data_privacy_agreement.go @@ -56,7 +56,7 @@ func (v VendorDataPrivacyAgreement) CursorKey(orderBy VendorDataPrivacyAgreement panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (vdpa *VendorDataPrivacyAgreement) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (vdpa *VendorDataPrivacyAgreement) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM vendor_data_privacy_agreements WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -72,7 +72,7 @@ func (vdpa *VendorDataPrivacyAgreement) AuthorizationAttributes(ctx context.Cont func (vdpa *VendorDataPrivacyAgreement) LoadByVendorID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorID gid.GID, ) error { @@ -118,7 +118,7 @@ LIMIT 1; func (vdpa *VendorDataPrivacyAgreement) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorDataPrivacyAgreementID gid.GID, ) error { @@ -164,7 +164,7 @@ LIMIT 1; func (vdpa *VendorDataPrivacyAgreement) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -202,7 +202,7 @@ WHERE func (vdpa *VendorDataPrivacyAgreement) Upsert( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, ) error { q := ` @@ -271,7 +271,7 @@ ON CONFLICT (organization_id, vendor_id) DO UPDATE SET func (vdpa *VendorDataPrivacyAgreement) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -295,7 +295,7 @@ WHERE func (vdpa *VendorDataPrivacyAgreement) DeleteByVendorID( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, vendorID gid.GID, ) error { @@ -319,7 +319,7 @@ WHERE func (vdpa VendorDataPrivacyAgreements) InsertVendorSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/vendor_risk_assessment.go b/pkg/coredata/vendor_risk_assessment.go index c8a3e8469..c28069bd0 100644 --- a/pkg/coredata/vendor_risk_assessment.go +++ b/pkg/coredata/vendor_risk_assessment.go @@ -57,7 +57,7 @@ func (v VendorRiskAssessment) CursorKey(orderBy VendorRiskAssessmentOrderField) panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (v *VendorRiskAssessment) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (v *VendorRiskAssessment) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM vendor_risk_assessments WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -74,7 +74,7 @@ func (v *VendorRiskAssessment) AuthorizationAttributes(ctx context.Context, conn // Insert adds a new risk assessment to the database func (r VendorRiskAssessment) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -124,7 +124,7 @@ VALUES ( // LoadByID loads a risk assessment by its ID func (r *VendorRiskAssessment) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, id gid.GID, ) error { @@ -173,7 +173,7 @@ LIMIT 1; // LoadLatestByVendorID loads the most recent risk assessment for a vendor func (r *VendorRiskAssessment) LoadLatestByVendorID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorID gid.GID, ) error { @@ -224,7 +224,7 @@ LIMIT 1; // LoadByVendorID loads all risk assessments for a vendor, ordered by assessment date func (r *VendorRiskAssessments) LoadByVendorID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorID gid.GID, cursor *page.Cursor[VendorRiskAssessmentOrderField], @@ -273,7 +273,7 @@ WHERE func (v VendorRiskAssessments) InsertVendorSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/vendor_service.go b/pkg/coredata/vendor_service.go index e02f3b2c9..0ed62ad90 100644 --- a/pkg/coredata/vendor_service.go +++ b/pkg/coredata/vendor_service.go @@ -54,7 +54,7 @@ func (vs VendorService) CursorKey(orderBy VendorServiceOrderField) page.CursorKe panic(fmt.Sprintf("unsupported order by: %s", orderBy)) } -func (vs *VendorService) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (vs *VendorService) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM vendor_services WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -70,7 +70,7 @@ func (vs *VendorService) AuthorizationAttributes(ctx context.Context, conn pg.Co func (vs *VendorService) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorServiceID gid.GID, ) error { @@ -120,7 +120,7 @@ LIMIT 1; func (vs *VendorServices) LoadByVendorID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, vendorID gid.GID, cursor *page.Cursor[VendorServiceOrderField], @@ -169,7 +169,7 @@ WHERE func (vs VendorService) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -217,7 +217,7 @@ VALUES ( func (vs VendorService) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -253,7 +253,7 @@ WHERE func (vs VendorService) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -280,7 +280,7 @@ WHERE func (vs VendorServices) InsertVendorSnapshots( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, organizationID gid.GID, snapshotID gid.GID, diff --git a/pkg/coredata/webhook_data.go b/pkg/coredata/webhook_data.go index b11df6007..06c2e200c 100644 --- a/pkg/coredata/webhook_data.go +++ b/pkg/coredata/webhook_data.go @@ -42,7 +42,7 @@ type ( func (w *WebhookData) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -83,7 +83,7 @@ VALUES ( func (w *WebhookData) LoadNextUnprocessedForUpdate( ctx context.Context, - conn pg.Conn, + conn pg.Tx, ) error { q := ` SELECT @@ -120,7 +120,7 @@ FOR UPDATE SKIP LOCKED func (w *WebhookData) UpdateProcessedAt( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/webhook_event.go b/pkg/coredata/webhook_event.go index ad9dd3f94..40e222ee9 100644 --- a/pkg/coredata/webhook_event.go +++ b/pkg/coredata/webhook_event.go @@ -51,7 +51,7 @@ func (w WebhookEvent) CursorKey(orderBy WebhookEventOrderField) page.CursorKey { func (w *WebhookEvents) LoadBySubscriptionID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, webhookSubscriptionID gid.GID, cursor *page.Cursor[WebhookEventOrderField], @@ -93,7 +93,7 @@ WHERE func (w *WebhookEvents) CountBySubscriptionID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, webhookSubscriptionID gid.GID, ) (int, error) { @@ -118,7 +118,7 @@ WHERE %s func (w *WebhookEvent) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -162,7 +162,7 @@ VALUES ( func (w *WebhookEvent) UpdateStatus( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/coredata/webhook_subscription.go b/pkg/coredata/webhook_subscription.go index 3c654d0c5..c820c0d65 100644 --- a/pkg/coredata/webhook_subscription.go +++ b/pkg/coredata/webhook_subscription.go @@ -85,7 +85,7 @@ func (w WebhookSubscription) CursorKey(orderBy WebhookSubscriptionOrderField) pa } // AuthorizationAttributes returns the authorization attributes for policy evaluation. -func (w *WebhookSubscription) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) { +func (w *WebhookSubscription) AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) { q := `SELECT organization_id FROM webhook_subscriptions WHERE id = $1 LIMIT 1;` var organizationID gid.GID @@ -101,7 +101,7 @@ func (w *WebhookSubscription) AuthorizationAttributes(ctx context.Context, conn func (w *WebhookSubscription) LoadByID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, webhookSubscriptionID gid.GID, ) error { @@ -147,7 +147,7 @@ LIMIT 1; func (w *WebhookSubscriptions) LoadByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, cursor *page.Cursor[WebhookSubscriptionOrderField], @@ -190,7 +190,7 @@ WHERE func (w *WebhookSubscriptions) CountByOrganizationID( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, ) (int, error) { @@ -221,7 +221,7 @@ WHERE func (w *WebhookSubscriptions) ExistsByOrganizationIDAndEventType( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, eventType WebhookEventType, @@ -253,7 +253,7 @@ SELECT EXISTS ( func (w *WebhookSubscription) Insert( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -301,7 +301,7 @@ VALUES ( func (w *WebhookSubscription) Update( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` @@ -338,7 +338,7 @@ WHERE %s func (w *WebhookSubscriptions) LoadMatchingByOrganizationIDAndEventType( ctx context.Context, - conn pg.Conn, + conn pg.Querier, scope Scoper, organizationID gid.GID, eventType WebhookEventType, @@ -383,7 +383,7 @@ WHERE func (w *WebhookSubscription) Delete( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope Scoper, ) error { q := ` diff --git a/pkg/esign/completion_certificate_worker.go b/pkg/esign/completion_certificate_worker.go index 837b38d74..2bf5fed70 100644 --- a/pkg/esign/completion_certificate_worker.go +++ b/pkg/esign/completion_certificate_worker.go @@ -145,7 +145,7 @@ func (w *CompletionCertificateWorker) processNext(ctx context.Context, sem chan if err := w.pg.WithTx( nonCancelableCtx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := signature.LoadNextCompletedWithoutCertificateForUpdate(nonCancelableCtx, tx); err != nil { return err } @@ -198,7 +198,7 @@ func (w *CompletionCertificateWorker) generateAndCommit( if err := w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { signature.CertificateFileID = &attachments[1].FileID signature.UpdatedAt = time.Now() if err := signature.Update(ctx, tx, scope); err != nil { @@ -245,7 +245,7 @@ func (w *CompletionCertificateWorker) generateCertificate( if err := w.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := events.LoadBySignatureID(ctx, conn, scope, signature.ID); err != nil { return fmt.Errorf("cannot load events: %w", err) } @@ -298,7 +298,7 @@ func (w *CompletionCertificateWorker) generateCertificate( if err := w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := certificateOfCompletionFile.Insert(ctx, tx, scope); err != nil { return fmt.Errorf("cannot insert certificate of completion file: %w", err) } @@ -366,7 +366,7 @@ func (w *CompletionCertificateWorker) handleCertFailure( return w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { errStr := processingError.Error() signature.LastError = &errStr signature.CertificateProcessingStartedAt = nil @@ -388,7 +388,7 @@ func (w *CompletionCertificateWorker) handleCertFailure( func (w *CompletionCertificateWorker) recoverStaleCertificateRows(ctx context.Context) { if err := w.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return coredata.ResetStaleCertificateProcessing(ctx, conn, w.staleAfter) }, ); err != nil { diff --git a/pkg/esign/sealing_worker.go b/pkg/esign/sealing_worker.go index e30ebee71..3e7bb0b6c 100644 --- a/pkg/esign/sealing_worker.go +++ b/pkg/esign/sealing_worker.go @@ -146,7 +146,7 @@ func (w *SealingWorker) processNext(ctx context.Context, sem chan struct{}, wg * if err := w.pg.WithTx( nonCancelableCtx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := signature.LoadNextAcceptedForUpdateSkipLocked(nonCancelableCtx, tx); err != nil { return err } @@ -194,7 +194,7 @@ func (w *SealingWorker) sealAndCommit( if err := w.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := file.LoadByID(ctx, conn, scope, signature.FileID); err != nil { return fmt.Errorf("cannot load file: %w", err) } @@ -244,7 +244,7 @@ func (w *SealingWorker) sealAndCommit( if err := w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var current coredata.ElectronicSignature if err := current.LoadByID(ctx, tx, scope, signature.ID); err != nil { return fmt.Errorf("cannot load signature: %w", err) @@ -298,7 +298,7 @@ func (w *SealingWorker) failSignature( return w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { errStr := userFacingError(processingError) signature.LastError = &errStr signature.ProcessingStartedAt = nil @@ -340,7 +340,7 @@ func userFacingError(err error) string { func (w *SealingWorker) recoverStaleRows(ctx context.Context) { if err := w.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return coredata.ResetStaleProcessingSignatures(ctx, conn, w.staleAfter) }, ); err != nil { diff --git a/pkg/esign/service.go b/pkg/esign/service.go index e43f04126..04df045da 100644 --- a/pkg/esign/service.go +++ b/pkg/esign/service.go @@ -143,7 +143,7 @@ func (s *Service) Run(ctx context.Context, presenterConfigFunc EmailPresenterCon func (s *Service) CreateSignature( ctx context.Context, - conn pg.Conn, + conn pg.Tx, req *CreateSignatureRequest, ) (*coredata.ElectronicSignature, error) { consentText := req.ConsentText @@ -194,7 +194,7 @@ func (s *Service) CreateSignature( func (s *Service) CreateAndAcceptSignature( ctx context.Context, - conn pg.Conn, + conn pg.Tx, req *CreateAndAcceptSignatureRequest, ) (*coredata.ElectronicSignature, error) { sig, err := s.CreateSignature( @@ -247,7 +247,7 @@ func (s *Service) CreateAndAcceptSignature( func (s *Service) createStampedDocument( ctx context.Context, - conn pg.Conn, + conn pg.Tx, scope coredata.Scoper, organizationID gid.GID, originalFileID gid.GID, @@ -312,7 +312,7 @@ func (s *Service) AcceptSignature(ctx context.Context, req *AcceptSignatureReque err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := signature.LoadByID(ctx, tx, scope, req.SignatureID); err != nil { return fmt.Errorf("cannot load electronic signature: %w", err) } @@ -366,13 +366,13 @@ func (s *Service) AcceptSignature(ctx context.Context, req *AcceptSignatureReque func (s *Service) RecordEvent(ctx context.Context, req *RecordEventRequest) error { return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { return s.recordEvent(ctx, tx, req) }, ) } -func (s *Service) recordEvent(ctx context.Context, tx pg.Conn, req *RecordEventRequest) error { +func (s *Service) recordEvent(ctx context.Context, tx pg.Tx, req *RecordEventRequest) error { var ( now = time.Now() scope = coredata.NewScopeFromObjectID(req.SignatureID) @@ -405,7 +405,7 @@ func (s *Service) GetSignatureByID(ctx context.Context, id gid.GID) (*coredata.E err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := signature.LoadByID(ctx, conn, scope, id); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { return ErrElectronicSignatureNotFound @@ -436,7 +436,7 @@ func (s *Service) GenerateCertificateFileURL( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := file.LoadByID(ctx, conn, scope, certificateFileID); err != nil { return fmt.Errorf("cannot load certificate file: %w", err) } @@ -469,7 +469,7 @@ func (s *Service) GenerateSignatureFileURL( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := signature.LoadByID(ctx, conn, scope, signatureID); err != nil { return fmt.Errorf("cannot load electronic signature: %w", err) } @@ -503,7 +503,7 @@ func (s *Service) GetEventsBySignatureID( ) err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := events.LoadBySignatureID(ctx, conn, scope, signatureID); err != nil { return fmt.Errorf("cannot load events: %w", err) } diff --git a/pkg/file/service.go b/pkg/file/service.go index 7f1845484..d0b867271 100644 --- a/pkg/file/service.go +++ b/pkg/file/service.go @@ -46,7 +46,7 @@ func (s *Service) GetPublicFileURL( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := file.LoadPublicByID(ctx, conn, fileID); err != nil { return fmt.Errorf("cannot load public file: %w", err) } diff --git a/pkg/iam/account_service.go b/pkg/iam/account_service.go index e402f25a3..96387c38c 100644 --- a/pkg/iam/account_service.go +++ b/pkg/iam/account_service.go @@ -99,7 +99,7 @@ func (s AccountService) ChangeEmail(ctx context.Context, identityID gid.GID, req return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { identity := &coredata.Identity{} err := identity.LoadByID(ctx, tx, identityID) if err != nil { @@ -162,7 +162,7 @@ func (s AccountService) VerifyEmail(ctx context.Context, token string) error { return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { identity := &coredata.Identity{} err := identity.LoadByID(ctx, tx, payload.Data.IdentityID) if err != nil { @@ -206,7 +206,7 @@ func (s *AccountService) ListPendingInvitations( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { profile := coredata.MembershipProfile{} err := profile.LoadByID(ctx, conn, scope, userID) if err != nil { @@ -242,7 +242,7 @@ func (s AccountService) ChangePassword(ctx context.Context, identityID gid.GID, return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { identity := &coredata.Identity{} err := identity.LoadByID(ctx, tx, identityID) if err != nil { @@ -287,7 +287,7 @@ func (s AccountService) CountSessions(ctx context.Context, identityID gid.GID) ( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { sessions := coredata.Sessions{} count, err = sessions.CountByIdentityID(ctx, conn, identityID) if err != nil { @@ -310,7 +310,7 @@ func (s AccountService) ListSessions( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := sessions.LoadByIdentityID(ctx, conn, identityID, cursor) if err != nil { return fmt.Errorf("cannot load sessions: %w", err) @@ -332,7 +332,7 @@ func (s AccountService) GetIdentity(ctx context.Context, identityID gid.GID) (*c err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := identity.LoadByID(ctx, conn, identityID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -361,7 +361,7 @@ func (s AccountService) UpdateIdentity(ctx context.Context, identityID gid.GID, err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { err := identity.LoadByID(ctx, tx, identityID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -397,7 +397,7 @@ func (s AccountService) ListPersonalAPIKeys( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := personalAccessTokens.LoadByIdentityID(ctx, conn, identityID) if err != nil { return fmt.Errorf("cannot load personal access tokens: %w", err) @@ -419,7 +419,7 @@ func (s AccountService) CountPersonalAPIKeys(ctx context.Context, identityID gid err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { personalAccessTokens := coredata.PersonalAPIKeys{} count, err = personalAccessTokens.CountByIdentityID(ctx, conn, identityID) if err != nil { @@ -441,7 +441,7 @@ func (s *AccountService) RevealPersonalAPIKeyToken( err := s.pg.WithTx( ctx, - func(tx pg.Conn) (err error) { + func(ctx context.Context, tx pg.Tx) (err error) { personalAPIKey := &coredata.PersonalAPIKey{} if err := personalAPIKey.LoadByID(ctx, tx, personalAPIKeyID); err != nil { if err == coredata.ErrResourceNotFound { @@ -481,7 +481,7 @@ func (s AccountService) GetIdentityForMembership(ctx context.Context, membership err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { membership := &coredata.Membership{} err := membership.LoadByID(ctx, conn, scope, membershipID) if err != nil { @@ -525,7 +525,7 @@ func (s *AccountService) CreatePersonalAPIKey( err := s.pg.WithTx( ctx, - func(tx pg.Conn) (err error) { + func(ctx context.Context, tx pg.Tx) (err error) { now := time.Now() personalAPIKey = &coredata.PersonalAPIKey{ @@ -567,7 +567,7 @@ func (s *AccountService) DeletePersonalAPIKey( ) error { return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { personalAPIKey := &coredata.PersonalAPIKey{} err := personalAPIKey.LoadByID(ctx, tx, personalAPIKeyID) if err != nil { @@ -602,7 +602,7 @@ func (s AccountService) ListOrganizations(ctx context.Context, identityID gid.GI err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := organizations.LoadByIdentityID(ctx, conn, coredata.NewNoScope(), identityID, cursor) if err != nil { return fmt.Errorf("cannot load organizations: %w", err) @@ -628,7 +628,7 @@ func (s AccountService) GetMembershipForOrganization( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { identity := &coredata.Identity{} if err := identity.LoadByID(ctx, tx, identityID); err != nil { @@ -668,7 +668,7 @@ func (s AccountService) ListSAMLConfigurationsForEmail( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := samlConfigurations.LoadVerifiedByEmailDomain(ctx, conn, email.Domain()) if err != nil { return fmt.Errorf("cannot load saml configurations: %w", err) @@ -695,7 +695,7 @@ func (s AccountService) CountSAMLConfigurationsForEmail( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { count, err = samlConfigurations.CountVerifiedByEmailDomain(ctx, conn, email.Domain()) if err != nil { return fmt.Errorf("cannot count saml configurations: %w", err) @@ -723,7 +723,7 @@ func (s *AccountService) ListProfilesForIdentity( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := profiles.LoadByIdentityID(ctx, conn, identityID, cursor, filter); err != nil { return fmt.Errorf("cannot load profiles: %w", err) } @@ -750,7 +750,7 @@ func (s AccountService) CountProfiles( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { profiles := coredata.MembershipProfiles{} count, err = profiles.CountByIdentityID(ctx, conn, identityID, filter) if err != nil { diff --git a/pkg/iam/api_key.go b/pkg/iam/api_key.go index 3f504bf49..95d2cfe98 100644 --- a/pkg/iam/api_key.go +++ b/pkg/iam/api_key.go @@ -42,7 +42,7 @@ func (s *APIKeyService) GetAPIKey(ctx context.Context, keyID gid.GID) (*coredata err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := apiKey.LoadByID(ctx, tx, keyID); err != nil { if err == coredata.ErrResourceNotFound { return NewPersonalAPIKeyNotFoundError(keyID) diff --git a/pkg/iam/auth_service.go b/pkg/iam/auth_service.go index da841833c..92420eef0 100644 --- a/pkg/iam/auth_service.go +++ b/pkg/iam/auth_service.go @@ -142,7 +142,7 @@ func (s *AuthService) ActivateAccount( if err = s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { err := invitation.LoadByID(ctx, tx, scope, payload.Data.InvitationID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -256,7 +256,7 @@ func (s AuthService) ResetPassword( return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { identity := &coredata.Identity{} err := identity.LoadByEmail(ctx, tx, payload.Data.Email) if err != nil { @@ -295,7 +295,7 @@ func (s AuthService) SendPasswordResetInstructionByEmail( return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { identity := &coredata.Identity{} if err := identity.LoadByEmail(ctx, tx, email); err != nil { if err == coredata.ErrResourceNotFound { @@ -396,7 +396,7 @@ func (s AuthService) CreateIdentityWithPassword( err = s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { err := identity.Insert(ctx, tx) if err != nil { if err == coredata.ErrResourceAlreadyExists { @@ -426,7 +426,7 @@ func (s AuthService) OpenSessionWithSAML(ctx context.Context, identityID gid.GID err := s.pg.WithTx( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Tx) (err error) { session = coredata.NewRootSession(identityID, coredata.AuthMethodSAML, s.sessionDuration) err = session.Insert(ctx, conn) if err != nil { @@ -449,7 +449,7 @@ func (s AuthService) OpenSessionWithOIDC(ctx context.Context, identityID gid.GID err := s.pg.WithTx( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Tx) (err error) { session = coredata.NewRootSession(identityID, authMethod, s.sessionDuration) err = session.Insert(ctx, conn) if err != nil { @@ -484,7 +484,7 @@ func (s AuthService) CheckCredentials( err = s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { err := identity.LoadByEmail(ctx, conn, email) if err != nil { // Do not leak information about non-existent identities @@ -521,7 +521,7 @@ func (s AuthService) OpenSessionWithPassword(ctx context.Context, identityID gid err := s.pg.WithTx( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Tx) (err error) { session = coredata.NewRootSession(identityID, coredata.AuthMethodPassword, s.sessionDuration) err = session.Insert(ctx, conn) if err != nil { @@ -555,7 +555,7 @@ func (s AuthService) SendMagicLink(ctx context.Context, req *SendMagicLinkReques return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { hashedToken := HashToken(tokenString) token := &coredata.Token{ ID: gid.New(gid.NilTenant, coredata.TokenEntityType), @@ -664,7 +664,7 @@ func (s AuthService) OpenSessionWithMagicLink(ctx context.Context, tokenString s if err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { hashedValue := HashToken(tokenString) token := &coredata.Token{} diff --git a/pkg/iam/authorizer.go b/pkg/iam/authorizer.go index 171b54db3..8e12a022d 100644 --- a/pkg/iam/authorizer.go +++ b/pkg/iam/authorizer.go @@ -33,7 +33,7 @@ import ( // AuthorizationAttributer is implemented by entities that provide attributes // for policy condition evaluation. type AuthorizationAttributer interface { - AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) + AuthorizationAttributes(ctx context.Context, conn pg.Querier) (map[string]string, error) } // AuthorizeParams contains the parameters for an authorization request. @@ -76,11 +76,11 @@ func (a *Authorizer) Authorize(ctx context.Context, params AuthorizeParams) erro return NewUnsupportedPrincipalTypeError(params.Principal.EntityType()) } - return a.pg.WithConn(ctx, func(conn pg.Conn) error { return a.authorize(ctx, conn, params) }) + return a.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { return a.authorize(ctx, tx, params) }) } -func (a *Authorizer) authorize(ctx context.Context, conn pg.Conn, params AuthorizeParams) error { - resourceAttrs, err := a.buildResourceAttributes(ctx, conn, params) +func (a *Authorizer) authorize(ctx context.Context, tx pg.Tx, params AuthorizeParams) error { + resourceAttrs, err := a.buildResourceAttributes(ctx, tx, params) if err != nil { return fmt.Errorf("cannot build resource attributes: %w", err) } @@ -88,7 +88,7 @@ func (a *Authorizer) authorize(ctx context.Context, conn pg.Conn, params Authori resourceOrgID := resourceAttrs["organization_id"] // Find role for resource's organization - membership, err := a.loadMembership(ctx, conn, params.Principal, resourceOrgID) + membership, err := a.loadMembership(ctx, tx, params.Principal, resourceOrgID) if err != nil { return fmt.Errorf("cannot load memberships for principal: %w", err) } @@ -97,7 +97,7 @@ func (a *Authorizer) authorize(ctx context.Context, conn pg.Conn, params Authori if membership != nil && params.Session != nil && !params.SkipAssumptionCheck { if _, err := a.getActiveChildSessionForMembership( ctx, - conn, + tx, *params.Session, membership.ID, ); err != nil { @@ -126,7 +126,7 @@ func (a *Authorizer) authorize(ctx context.Context, conn pg.Conn, params Authori } } - principalAttrs, err := a.buildPrincipalAttributes(ctx, conn, params.Principal, scopedPrincipalAttrs) + principalAttrs, err := a.buildPrincipalAttributes(ctx, tx, params.Principal, scopedPrincipalAttrs) if err != nil { return fmt.Errorf("cannot build principal attributes: %w", err) } @@ -144,7 +144,7 @@ func (a *Authorizer) authorize(ctx context.Context, conn pg.Conn, params Authori } if a.evaluator.Evaluate(req, policies).IsAllowed() { - a.recordAuditLog(ctx, conn, params, resourceAttrs) + a.recordAuditLog(ctx, tx, params, resourceAttrs) return nil } @@ -153,7 +153,7 @@ func (a *Authorizer) authorize(ctx context.Context, conn pg.Conn, params Authori func (a *Authorizer) loadMembership( ctx context.Context, - conn pg.Conn, + conn pg.Querier, principalID gid.GID, resourceOrgID string, ) (*coredata.Membership, error) { @@ -180,7 +180,7 @@ func (a *Authorizer) loadMembership( func (a *Authorizer) getActiveChildSessionForMembership( ctx context.Context, - conn pg.Conn, + conn pg.Querier, rootSessionID gid.GID, membershipID gid.GID, ) (*coredata.Session, error) { @@ -203,7 +203,7 @@ func (a *Authorizer) getActiveChildSessionForMembership( func (a *Authorizer) buildPrincipalAttributes( ctx context.Context, - conn pg.Conn, + conn pg.Querier, principalID gid.GID, defaultAttrs map[string]string, ) (map[string]string, error) { @@ -227,7 +227,7 @@ func (a *Authorizer) buildPrincipalAttributes( func (a *Authorizer) buildResourceAttributes( ctx context.Context, - conn pg.Conn, + conn pg.Querier, params AuthorizeParams, ) (map[string]string, error) { attrs := map[string]string{ @@ -288,7 +288,7 @@ func resourceTypeFromAction(action string) string { func (a *Authorizer) recordAuditLog( ctx context.Context, - conn pg.Conn, + tx pg.Tx, params AuthorizeParams, resourceAttrs map[string]string, ) { @@ -344,7 +344,7 @@ func (a *Authorizer) recordAuditLog( scope := coredata.NewScope(orgID.TenantID()) - if err := entry.Insert(ctx, conn, scope); err != nil { + if err := entry.Insert(ctx, tx, scope); err != nil { a.logger.ErrorCtx( ctx, "cannot insert audit log entry", diff --git a/pkg/iam/compliance_page_service.go b/pkg/iam/compliance_page_service.go index bf44c6dd9..c2589ecd0 100644 --- a/pkg/iam/compliance_page_service.go +++ b/pkg/iam/compliance_page_service.go @@ -49,7 +49,7 @@ func (s *CompliancePageService) GenerateLogoURL( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := compliancePage.LoadByID(ctx, conn, scope, compliancePageID); err != nil { return fmt.Errorf("cannot load compliance page: %w", err) } @@ -98,7 +98,7 @@ func (s *CompliancePageService) EmailPresenterConfig(ctx context.Context, compli err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := compliancePage.LoadByID(ctx, conn, scope, compliancePageID); err != nil { return fmt.Errorf("cannot load compliance page: %w", err) } diff --git a/pkg/iam/oidc/gc.go b/pkg/iam/oidc/gc.go index 8432586de..9eb2b6f06 100644 --- a/pkg/iam/oidc/gc.go +++ b/pkg/iam/oidc/gc.go @@ -92,7 +92,7 @@ func (gc *GarbageCollector) cleanup(ctx context.Context) error { return gc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var state coredata.OIDCState deleted, err := state.DeleteExpired(ctx, tx, now) if err != nil { diff --git a/pkg/iam/oidc/service.go b/pkg/iam/oidc/service.go index 5d5703400..6ad0ea42e 100644 --- a/pkg/iam/oidc/service.go +++ b/pkg/iam/oidc/service.go @@ -302,7 +302,7 @@ func (s *Service) InitiateLogin( err = s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := oidcState.Insert(ctx, tx); err != nil { return fmt.Errorf("cannot store oidc state: %w", err) } @@ -339,7 +339,7 @@ func (s *Service) HandleCallback( var oidcState coredata.OIDCState err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := oidcState.LoadByIDForUpdate(ctx, tx, stateParam); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { return NewInvalidStateError() @@ -407,7 +407,7 @@ func (s *Service) HandleCallback( err = s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { identity = &coredata.Identity{} err := identity.LoadByEmail(ctx, tx, email) if err != nil { diff --git a/pkg/iam/organization_service.go b/pkg/iam/organization_service.go index da674012d..e177b85c9 100644 --- a/pkg/iam/organization_service.go +++ b/pkg/iam/organization_service.go @@ -252,7 +252,7 @@ func (s *OrganizationService) UpdateMempership( membership := coredata.Membership{} if err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := membership.LoadByID(ctx, tx, scope, membershipID); err != nil { if err == coredata.ErrResourceNotFound { @@ -291,7 +291,7 @@ func (s *OrganizationService) RemoveUser( return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { profile := coredata.MembershipProfile{} if err := profile.LoadByID(ctx, tx, scope, profileID); err != nil { @@ -359,7 +359,7 @@ func (s *OrganizationService) InviteUser( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { organization := coredata.Organization{} err := organization.LoadByID(ctx, tx, scope, req.OrganizationID) if err != nil { @@ -583,7 +583,7 @@ func (s *OrganizationService) CreateOrganization( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { identity := &coredata.Identity{} err := identity.LoadByID(ctx, tx, identityID) if err != nil { @@ -764,7 +764,7 @@ func (s *OrganizationService) UpdateOrganization(ctx context.Context, organizati err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { err := organization.LoadByID(ctx, tx, scope, organizationID) if err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -852,7 +852,7 @@ func (s *OrganizationService) DeleteOrganization(ctx context.Context, organizati return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { organization := &coredata.Organization{} err := organization.LoadByID(ctx, tx, scope, organizationID) if err != nil { @@ -882,7 +882,7 @@ func (s *OrganizationService) CreateUser(ctx context.Context, req *CreateUserReq err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { identity := &coredata.Identity{} if err := identity.LoadByEmail(ctx, conn, req.EmailAddress); err != nil { if !errors.Is(err, coredata.ErrResourceNotFound) { @@ -973,7 +973,7 @@ func (s *OrganizationService) UpdateUser(ctx context.Context, req *UpdateUserReq err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := profile.LoadByID(ctx, conn, scope, req.ID); err != nil { return fmt.Errorf("cannot load profile: %w", err) } @@ -1024,17 +1024,17 @@ func (s *OrganizationService) UpdateUserState( profile = &coredata.MembershipProfile{} ) - err := s.pg.WithConn( + err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := profile.LoadByID(ctx, conn, scope, userID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := profile.LoadByID(ctx, tx, scope, userID); err != nil { return fmt.Errorf("cannot load profile: %w", err) } profile.State = state profile.UpdatedAt = time.Now() - if err := profile.Update(ctx, conn, scope); err != nil { + if err := profile.Update(ctx, tx, scope); err != nil { return fmt.Errorf("cannot update profile: %w", err) } @@ -1054,7 +1054,7 @@ func (s *OrganizationService) GetProfile(ctx context.Context, profileID gid.GID) err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := profile.LoadByID(ctx, conn, coredata.NewScopeFromObjectID(profileID), profileID); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { return NewProfileNotFoundError(profileID) @@ -1083,7 +1083,7 @@ func (s *OrganizationService) GetProfilesByIDs( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := profiles.LoadByIDs( ctx, conn, @@ -1108,7 +1108,7 @@ func (s *OrganizationService) GetProfileForIdentityAndOrganization(ctx context.C err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := profile.LoadByIdentityIDAndOrganizationID( ctx, conn, @@ -1147,7 +1147,7 @@ func (s *OrganizationService) ListProfiles( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := profiles.LoadByOrganizationID(ctx, conn, scope, organizationID, cursor, filter); err != nil { return fmt.Errorf("cannot load profiles: %w", err) } @@ -1175,7 +1175,7 @@ func (s OrganizationService) CountProfiles( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { profiles := coredata.MembershipProfiles{} count, err = profiles.CountByOrganizationID(ctx, conn, scope, organizationID, filter) if err != nil { @@ -1197,7 +1197,7 @@ func (s *OrganizationService) GetOrganizationForMembership(ctx context.Context, err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { membership := &coredata.Membership{} err := membership.LoadByID(ctx, conn, scope, membershipID) if err != nil { @@ -1241,7 +1241,7 @@ func (s OrganizationService) GenerateLogoURL( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -1287,7 +1287,7 @@ func (s OrganizationService) GenerateHorizontalLogoURL( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -1329,7 +1329,7 @@ func (s OrganizationService) DeleteSAMLConfiguration( return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var config coredata.SAMLConfiguration if err := config.LoadByID(ctx, tx, scope, configID); err != nil { return fmt.Errorf("cannot load saml configuration: %w", err) @@ -1360,7 +1360,7 @@ func (s OrganizationService) ListSAMLConfigurations( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := samlConfigurations.LoadByOrganizationID(ctx, conn, scope, organizationID) if err != nil { return fmt.Errorf("cannot load saml configurations: %w", err) @@ -1387,7 +1387,7 @@ func (s OrganizationService) CountSAMLConfigurations( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { samlConfigurations := coredata.SAMLConfigurations{} count, err = samlConfigurations.CountByOrganizationID(ctx, conn, scope, organizationID) if err != nil { @@ -1413,7 +1413,7 @@ func (s OrganizationService) ListSCIMEvents( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := scimEvents.LoadByOrganizationID(ctx, conn, scope, organizationID, cursor) if err != nil { return fmt.Errorf("cannot load scim events: %w", err) @@ -1440,7 +1440,7 @@ func (s OrganizationService) CountSCIMEvents( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { scimEvents := coredata.SCIMEvents{} count, err = scimEvents.CountByOrganizationID(ctx, conn, scope, organizationID) if err != nil { @@ -1465,7 +1465,7 @@ func (s OrganizationService) GetSCIMConfiguration( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := config.LoadByOrganizationID(ctx, conn, scope, organizationID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -1509,7 +1509,7 @@ func (s OrganizationService) CreateSCIMConfiguration( err = s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { err := config.Insert(ctx, tx, scope) if err != nil { if err == coredata.ErrResourceAlreadyExists { @@ -1537,7 +1537,7 @@ func (s OrganizationService) DeleteSCIMConfiguration( return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { config := &coredata.SCIMConfiguration{} err := config.LoadByID(ctx, tx, scope, configID) if err != nil { @@ -1608,7 +1608,7 @@ func (s OrganizationService) RegenerateSCIMToken( err = s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { err := config.LoadByID(ctx, tx, scope, configID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -1652,7 +1652,7 @@ func (s OrganizationService) UpdateSCIMBridge( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { err := bridge.LoadByID(ctx, tx, scope, bridgeID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -1697,7 +1697,7 @@ func (s OrganizationService) ListSCIMEventsByConfigID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := scimEvents.LoadBySCIMConfigurationID(ctx, conn, scope, scimConfigurationID, cursor) if err != nil { return fmt.Errorf("cannot load scim events: %w", err) @@ -1724,7 +1724,7 @@ func (s OrganizationService) CountSCIMEventsByConfigID( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { scimEvents := coredata.SCIMEvents{} count, err = scimEvents.CountBySCIMConfigurationID(ctx, conn, scope, scimConfigurationID) if err != nil { @@ -1784,7 +1784,7 @@ func (s OrganizationService) CreateSAMLConfiguration( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { organization := &coredata.Organization{} err := organization.LoadByID(ctx, tx, scope, organizationID) if err != nil { @@ -1823,7 +1823,7 @@ func (s OrganizationService) UpdateSAMLConfiguration( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { organization := &coredata.Organization{} err := organization.LoadByID(ctx, tx, scope, organizationID) if err != nil { @@ -1902,7 +1902,7 @@ func (s OrganizationService) GetOrganization(ctx context.Context, organizationID err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := organization.LoadByID(ctx, conn, scope, organizationID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -1930,7 +1930,7 @@ func (s OrganizationService) GetSCIMBridgeByID(ctx context.Context, bridgeID gid err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := bridge.LoadByID(ctx, conn, scope, bridgeID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -1961,7 +1961,7 @@ func (s OrganizationService) GetConnectorMetadataByID(ctx context.Context, conne err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := connector.LoadMetadataByID(ctx, conn, scope, connectorID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -1990,7 +1990,7 @@ func (s OrganizationService) GetSCIMBridgeByOrganizationID(ctx context.Context, err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := bridge.LoadByOrganizationID(ctx, conn, scope, organizationID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -2030,7 +2030,7 @@ func (s OrganizationService) CreateSCIMBridge( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { organization := &coredata.Organization{} err := organization.LoadByID(ctx, tx, scope, organizationID) if err != nil { @@ -2113,7 +2113,7 @@ func (s OrganizationService) DeleteSCIMBridge(ctx context.Context, organizationI err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { organization := &coredata.Organization{} err := organization.LoadByID(ctx, tx, scope, organizationID) if err != nil { @@ -2154,7 +2154,7 @@ func (s *OrganizationService) GetAuditLogEntry( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return entry.LoadByID(ctx, conn, scope, id) }, ) @@ -2178,7 +2178,7 @@ func (s *OrganizationService) ListAuditLogEntries( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := entries.LoadAllByOrganizationID(ctx, conn, scope, organizationID, cursor, filter); err != nil { return fmt.Errorf("cannot load audit log entries: %w", err) } @@ -2205,7 +2205,7 @@ func (s *OrganizationService) CountAuditLogEntries( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { entries := coredata.AuditLogEntries{} count, err = entries.CountByOrganizationID(ctx, conn, scope, organizationID, filter) if err != nil { diff --git a/pkg/iam/saml/gc.go b/pkg/iam/saml/gc.go index 0590db9b9..a4a9236f0 100644 --- a/pkg/iam/saml/gc.go +++ b/pkg/iam/saml/gc.go @@ -96,7 +96,7 @@ func (gc *GarbageCollector) cleanup(ctx context.Context) error { return gc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { assertionsDeleted, err := coredata.DeleteExpiredSAMLAssertions(ctx, tx, now) if err != nil { return fmt.Errorf("cannot delete expired saml assertions: %w", err) diff --git a/pkg/iam/saml/service.go b/pkg/iam/saml/service.go index e50bdde4b..8e2cd3b70 100644 --- a/pkg/iam/saml/service.go +++ b/pkg/iam/saml/service.go @@ -110,7 +110,7 @@ func (s *Service) InitiateLogin( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { config := &coredata.SAMLConfiguration{} err := config.LoadByID(ctx, tx, coredata.NewNoScope(), configID) if err != nil { @@ -177,7 +177,7 @@ func (s *Service) HandleAssertion( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { config := &coredata.SAMLConfiguration{} err := config.LoadByID(ctx, tx, coredata.NewNoScope(), configID) diff --git a/pkg/iam/saml_domain_verifier.go b/pkg/iam/saml_domain_verifier.go index 9eed5edf3..af1400a00 100644 --- a/pkg/iam/saml_domain_verifier.go +++ b/pkg/iam/saml_domain_verifier.go @@ -101,7 +101,7 @@ func (v *SAMLDomainVerifier) checkUnverifiedDomains(ctx context.Context) error { err := v.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := configs.LoadUnverified(ctx, conn) if err != nil { return fmt.Errorf("cannot load unverified SAML configurations: %w", err) @@ -148,7 +148,7 @@ func (v *SAMLDomainVerifier) checkUnverifiedDomains(ctx context.Context) error { func (v *SAMLDomainVerifier) tryVerifyDomain(ctx context.Context, configID gid.GID) error { return v.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { config := &coredata.SAMLConfiguration{} if err := config.LoadByIDForUpdateSkipLocked(ctx, tx, configID); err != nil { if err == coredata.ErrResourceNotFound { diff --git a/pkg/iam/scim/bridge_runner_state.go b/pkg/iam/scim/bridge_runner_state.go index ceeebf7df..986a30ca0 100644 --- a/pkg/iam/scim/bridge_runner_state.go +++ b/pkg/iam/scim/bridge_runner_state.go @@ -38,7 +38,7 @@ func (r *BridgeRunner) acquireNextBridge(ctx context.Context) (*coredata.SCIMBri err := r.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { bridge = &coredata.SCIMBridge{} if err := bridge.LoadNextForSyncSkipLocked(ctx, tx, r.cfg.StaleSyncThreshold); err != nil { return err @@ -70,9 +70,9 @@ func (r *BridgeRunner) transitionToSuccess( connector *coredata.Connector, logger *log.Logger, ) error { - return r.pg.WithConn( + return r.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { now := time.Now() nextSync := now.Add(r.cfg.Interval) @@ -84,7 +84,7 @@ func (r *BridgeRunner) transitionToSuccess( bridge.TotalSyncCount++ bridge.UpdatedAt = now - if err := bridge.Update(ctx, conn, scope); err != nil { + if err := bridge.Update(ctx, tx, scope); err != nil { logger.ErrorCtx( ctx, "cannot update bridge after successful sync", @@ -95,7 +95,7 @@ func (r *BridgeRunner) transitionToSuccess( if connector != nil { connector.UpdatedAt = now - if err := connector.Update(ctx, conn, scope, r.encryptionKey); err != nil { + if err := connector.Update(ctx, tx, scope, r.encryptionKey); err != nil { logger.WarnCtx( ctx, "cannot persist refreshed OAuth2 token", @@ -129,9 +129,9 @@ func (r *BridgeRunner) transitionToFailed( duration time.Duration, logger *log.Logger, ) error { - return r.pg.WithConn( + return r.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { now := time.Now() bridge.ConsecutiveFailures++ @@ -171,7 +171,7 @@ func (r *BridgeRunner) transitionToFailed( ) } - if err := bridge.Update(ctx, conn, scope); err != nil { + if err := bridge.Update(ctx, tx, scope); err != nil { logger.ErrorCtx( ctx, "cannot update bridge after failed sync", diff --git a/pkg/iam/scim/bridge_runner_sync.go b/pkg/iam/scim/bridge_runner_sync.go index 772e44728..6196298e6 100644 --- a/pkg/iam/scim/bridge_runner_sync.go +++ b/pkg/iam/scim/bridge_runner_sync.go @@ -38,11 +38,11 @@ func (r *BridgeRunner) executeSync( ) (stats SyncStats, duration time.Duration, connector *coredata.Connector, err error) { start := time.Now() - err = r.pg.WithConn( + err = r.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var syncErr error - stats, connector, syncErr = r.doSync(ctx, conn, bridge, scope, logger) + stats, connector, syncErr = r.doSync(ctx, tx, bridge, scope, logger) return syncErr }, ) @@ -53,7 +53,7 @@ func (r *BridgeRunner) executeSync( func (r *BridgeRunner) doSync( ctx context.Context, - conn pg.Conn, + tx pg.Tx, scimBridge *coredata.SCIMBridge, scope coredata.Scoper, logger *log.Logger, @@ -63,7 +63,7 @@ func (r *BridgeRunner) doSync( } dbConnector := &coredata.Connector{} - if err := dbConnector.LoadByID(ctx, conn, scope, *scimBridge.ConnectorID, r.encryptionKey); err != nil { + if err := dbConnector.LoadByID(ctx, tx, scope, *scimBridge.ConnectorID, r.encryptionKey); err != nil { return SyncStats{}, nil, fmt.Errorf("cannot load connector: %w", err) } @@ -73,7 +73,7 @@ func (r *BridgeRunner) doSync( } var scimConfig coredata.SCIMConfiguration - if err := scimConfig.LoadByID(ctx, conn, scope, scimBridge.ScimConfigurationID); err != nil { + if err := scimConfig.LoadByID(ctx, tx, scope, scimBridge.ScimConfigurationID); err != nil { return SyncStats{}, nil, fmt.Errorf("cannot load SCIM configuration: %w", err) } @@ -84,7 +84,7 @@ func (r *BridgeRunner) doSync( scimConfig.HashedToken = HashToken(token) scimConfig.UpdatedAt = time.Now() - if err := scimConfig.Update(ctx, conn, scope); err != nil { + if err := scimConfig.Update(ctx, tx, scope); err != nil { return SyncStats{}, nil, fmt.Errorf("cannot update SCIM configuration token: %w", err) } diff --git a/pkg/iam/scim/service.go b/pkg/iam/scim/service.go index fcf34c1c6..cb8c5f81b 100644 --- a/pkg/iam/scim/service.go +++ b/pkg/iam/scim/service.go @@ -107,7 +107,7 @@ func (s *Service) ValidateToken(ctx context.Context, token string) (*coredata.SC err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := config.LoadByHashedToken(ctx, conn, hashedToken) if err != nil { if err == coredata.ErrResourceNotFound { @@ -160,7 +160,7 @@ func (s *Service) CreateUser( scope := coredata.NewScopeFromObjectID(config.OrganizationID) - err = s.pg.WithTx(ctx, func(tx pg.Conn) error { + err = s.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { identity := &coredata.Identity{} if err := identity.LoadByEmail(ctx, tx, emailAddr); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { @@ -355,7 +355,7 @@ func (s *Service) GetUser( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { profile = &coredata.MembershipProfile{} if err := profile.LoadByID(ctx, conn, scope, profileID); err != nil { if err == coredata.ErrResourceNotFound { @@ -405,7 +405,7 @@ func (s *Service) ListUsers( err = s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var err error totalCount, err = profiles.CountByOrganizationID(ctx, conn, scope, config.OrganizationID, filter) if err != nil { @@ -486,7 +486,7 @@ func (s *Service) updateUser( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { profile = &coredata.MembershipProfile{} if err := profile.LoadByID(ctx, tx, scope, profileID); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { @@ -772,7 +772,7 @@ func (s *Service) DeleteUser( return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { profile := &coredata.MembershipProfile{} if err := profile.LoadByID(ctx, tx, scope, profileID); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { @@ -837,10 +837,10 @@ func (s *Service) LogEvent( event := s.createEvent(config, method, path, userName, ipAddress, statusCode, errorMessage) - err := s.pg.WithConn( + err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { - err := event.Insert(ctx, conn, scope) + func(ctx context.Context, tx pg.Tx) error { + err := event.Insert(ctx, tx, scope) if err != nil { return fmt.Errorf("cannot insert SCIM event: %w", err) } diff --git a/pkg/iam/service.go b/pkg/iam/service.go index 48eead089..89547b42b 100644 --- a/pkg/iam/service.go +++ b/pkg/iam/service.go @@ -249,7 +249,7 @@ func (s *Service) GetMembership(ctx context.Context, membershipID gid.GID) (*cor err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := membership.LoadByID(ctx, conn, scope, membershipID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -277,7 +277,7 @@ func (s *Service) GetInvitation(ctx context.Context, invitationID gid.GID) (*cor err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := invitation.LoadByID(ctx, conn, scope, invitationID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -302,7 +302,7 @@ func (s *Service) GetSession(ctx context.Context, sessionID gid.GID) (*coredata. err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := session.LoadByID(ctx, conn, sessionID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -330,7 +330,7 @@ func (s *Service) GetSAMLconfiguration(ctx context.Context, samlConfigurationID err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := samlConfiguration.LoadByID(ctx, conn, scope, samlConfigurationID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -355,7 +355,7 @@ func (s *Service) GetPersonalAPIKey(ctx context.Context, personalAPIKeyID gid.GI err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := personalAPIKey.LoadByID(ctx, conn, personalAPIKeyID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -383,7 +383,7 @@ func (s *Service) GetSCIMConfiguration(ctx context.Context, scimConfigurationID err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := scimConfiguration.LoadByID(ctx, conn, scope, scimConfigurationID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -411,7 +411,7 @@ func (s *Service) GetSCIMEvent(ctx context.Context, scimEventID gid.GID) (*cored err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := scimEvent.LoadByID(ctx, conn, scope, scimEventID) if err != nil { if err == coredata.ErrResourceNotFound { diff --git a/pkg/iam/session_service.go b/pkg/iam/session_service.go index c4e1ffc25..edb493d4f 100644 --- a/pkg/iam/session_service.go +++ b/pkg/iam/session_service.go @@ -43,7 +43,7 @@ func (s SessionService) GetSession(ctx context.Context, sessionID gid.GID) (*cor err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := session.LoadByID(ctx, tx, sessionID); err != nil { if err == coredata.ErrResourceNotFound { return NewSessionNotFoundError(sessionID) @@ -79,7 +79,7 @@ func (s SessionService) GetSession(ctx context.Context, sessionID gid.GID) (*cor func (s SessionService) CloseSession(ctx context.Context, sessionID gid.GID) error { return s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { session := &coredata.Session{} if err := session.LoadByID(ctx, conn, sessionID); err != nil { if err == coredata.ErrResourceNotFound { @@ -114,7 +114,7 @@ func (s SessionService) RevokeSession(ctx context.Context, identityID gid.GID, s return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { identity := &coredata.Identity{} err := identity.LoadByID(ctx, tx, identityID) if err != nil { @@ -166,7 +166,7 @@ func (s SessionService) RevokeAllSessions(ctx context.Context, currentSessionID err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { session := coredata.Session{} err := session.LoadByID(ctx, tx, currentSessionID) if err != nil { @@ -193,7 +193,7 @@ func (s SessionService) RevokeAllSessions(ctx context.Context, currentSessionID func (s SessionService) UpdateSessionInfo(ctx context.Context, sessionID gid.GID, userAgent string, ipAddress net.IP) error { return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { session := &coredata.Session{} err := session.LoadByID(ctx, tx, sessionID) if err != nil { @@ -224,7 +224,7 @@ func (s SessionService) UpdateSessionInfo(ctx context.Context, sessionID gid.GID func (s SessionService) UpdateSessionData(ctx context.Context, sessionID gid.GID, data coredata.SessionData) error { return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { session := &coredata.Session{} err := session.LoadByID(ctx, tx, sessionID) if err != nil { @@ -256,7 +256,7 @@ func (s SessionService) GetActiveSessionForMembership(ctx context.Context, rootS err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { rootSession := &coredata.Session{} err := rootSession.LoadByID(ctx, tx, rootSessionID) if err != nil { @@ -318,7 +318,7 @@ func (s SessionService) OpenPasswordChildSessionForOrganization( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { err := rootSession.LoadByID(ctx, tx, rootSessionID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -420,7 +420,7 @@ func (s SessionService) OpenSAMLChildSessionForOrganization( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { err := rootSession.LoadByID(ctx, tx, rootSessionID) if err != nil { if err == coredata.ErrResourceNotFound { @@ -509,7 +509,7 @@ func (s SessionService) AssumeOrganizationSession( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := rootSession.LoadByID(ctx, tx, sessionID); err != nil { if err == coredata.ErrResourceNotFound { return NewSessionNotFoundError(sessionID) diff --git a/pkg/mailer/mailer.go b/pkg/mailer/mailer.go index 8aff77218..fdb7aee9b 100644 --- a/pkg/mailer/mailer.go +++ b/pkg/mailer/mailer.go @@ -150,7 +150,7 @@ func (w *SendingWorker) processNext(ctx context.Context, sem chan struct{}, wg * if err := w.pg.WithTx( nonCancelableCtx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := email.LoadNextPendingForUpdateSkipLocked(nonCancelableCtx, tx); err != nil { return err } @@ -196,7 +196,7 @@ func (w *SendingWorker) sendAndCommit( if err := w.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var attachments coredata.EmailAttachments if err := attachments.LoadByEmailID(ctx, conn, email.ID); err != nil { return fmt.Errorf("cannot load email attachments: %w", err) @@ -268,7 +268,7 @@ func (w *SendingWorker) sendAndCommit( if err := w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { now := time.Now() email.Status = coredata.EmailStatusSent email.SentAt = &now @@ -307,7 +307,7 @@ func (w *SendingWorker) failEmail( return w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { errStr := processingError.Error() email.LastError = &errStr email.ProcessingStartedAt = nil @@ -331,7 +331,7 @@ func (w *SendingWorker) failEmail( func (w *SendingWorker) recoverStaleRows(ctx context.Context) { if err := w.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return coredata.ResetStaleProcessingEmails(ctx, conn, w.staleAfter) }, ); err != nil { diff --git a/pkg/mailman/compliance_mailing_list.go b/pkg/mailman/compliance_mailing_list.go index 3af6460d4..0f71d7c4e 100644 --- a/pkg/mailman/compliance_mailing_list.go +++ b/pkg/mailman/compliance_mailing_list.go @@ -67,7 +67,7 @@ func (s *Service) mailingListEmailConfig( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := mailingList.LoadByID(ctx, conn, scope, mailingListID); err != nil { return fmt.Errorf("cannot load mailing list: %w", err) } diff --git a/pkg/mailman/mailing_list_worker.go b/pkg/mailman/mailing_list_worker.go index 9030b7470..9a4cd1ef3 100644 --- a/pkg/mailman/mailing_list_worker.go +++ b/pkg/mailman/mailing_list_worker.go @@ -122,7 +122,7 @@ func (w *MailingListWorker) processNext(ctx context.Context, sem chan struct{}, if err := w.pg.WithTx( nonCancelableCtx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := mlu.LoadNextEnqueuedForUpdateSkipLocked(nonCancelableCtx, tx); err != nil { return err } @@ -176,7 +176,7 @@ func (w *MailingListWorker) sendAndCommit(ctx context.Context, mlu *coredata.Mai return w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { scope := coredata.NewScopeFromObjectID(mlu.ID) var current coredata.MailingListUpdate @@ -203,7 +203,7 @@ func (w *MailingListWorker) sendAndCommit(ctx context.Context, mlu *coredata.Mai func (w *MailingListWorker) resetEnqueued(ctx context.Context, mlu *coredata.MailingListUpdate) error { return w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { scope := coredata.NewScopeFromObjectID(mlu.ID) mlu.Status = coredata.MailingListUpdateStatusEnqueued mlu.UpdatedAt = time.Now() @@ -218,10 +218,10 @@ func (w *MailingListWorker) resetEnqueued(ctx context.Context, mlu *coredata.Mai } func (w *MailingListWorker) recoverStaleRows(ctx context.Context) { - err := w.pg.WithConn( + err := w.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := coredata.ResetStaleProcessingMailingListUpdates(ctx, conn, w.staleAfter); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := coredata.ResetStaleProcessingMailingListUpdates(ctx, tx, w.staleAfter); err != nil { return fmt.Errorf("cannot reset stale processing mailing list updates: %w", err) } return nil diff --git a/pkg/mailman/service.go b/pkg/mailman/service.go index 78aecbaeb..4dd575437 100644 --- a/pkg/mailman/service.go +++ b/pkg/mailman/service.go @@ -117,10 +117,10 @@ func (s *Service) UpdateMailingList( var ml coredata.MailingList scope := coredata.NewScopeFromObjectID(id) - err := s.pg.WithConn( + err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := ml.LoadByID(ctx, conn, scope, id); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := ml.LoadByID(ctx, tx, scope, id); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { return ErrMailingListNotFound } @@ -130,7 +130,7 @@ func (s *Service) UpdateMailingList( ml.ReplyTo = replyTo ml.UpdatedAt = time.Now() - if err := ml.Update(ctx, conn, scope); err != nil { + if err := ml.Update(ctx, tx, scope); err != nil { return fmt.Errorf("cannot update mailing list: %w", err) } @@ -154,7 +154,7 @@ func (s *Service) GetSubscriber( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := subscriber.LoadByMailingListIDAndEmail(ctx, conn, scope, mailingListID, email); err != nil { return fmt.Errorf("cannot load mailing list subscriber: %w", err) } @@ -210,7 +210,7 @@ func (s *Service) CreateSubscriber( if err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var ml coredata.MailingList if err := ml.LoadByID(ctx, tx, scope, mailingListID); err != nil { return fmt.Errorf("cannot load mailing list: %w", err) @@ -247,7 +247,7 @@ func (s *Service) UnsubscribeByEmail( scope := coredata.NewScopeFromObjectID(mailingListID) return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var subscriber coredata.MailingListSubscriber if err := subscriber.LoadByMailingListIDAndEmail(ctx, tx, scope, mailingListID, email); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { @@ -288,11 +288,11 @@ func (s *Service) ConfirmSubscriberByEmail( ) error { scope := coredata.NewScopeFromObjectID(mailingListID) - return s.pg.WithConn( + return s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var subscriber coredata.MailingListSubscriber - if err := subscriber.LoadByMailingListIDAndEmail(ctx, conn, scope, mailingListID, email); err != nil { + if err := subscriber.LoadByMailingListIDAndEmail(ctx, tx, scope, mailingListID, email); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { return ErrSubscriberNotFound } @@ -302,7 +302,7 @@ func (s *Service) ConfirmSubscriberByEmail( subscriber.Status = coredata.MailingListSubscriberStatusConfirmed subscriber.UpdatedAt = time.Now() - if err := subscriber.Update(ctx, conn, scope); err != nil { + if err := subscriber.Update(ctx, tx, scope); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { return ErrSubscriberNotFound } @@ -322,7 +322,7 @@ func (s *Service) DeleteSubscriber( return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var subscriber coredata.MailingListSubscriber if err := subscriber.LoadByID(ctx, tx, scope, id); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { @@ -365,7 +365,7 @@ func (s *Service) CountSubscribers( err := s.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { subscribers := coredata.MailingListSubscribers{} count, err = subscribers.CountByMailingListID(ctx, conn, scope, mailingListID) if err != nil { @@ -391,7 +391,7 @@ func (s *Service) ListSubscribers( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := subscribers.LoadByMailingListID(ctx, conn, scope, mailingListID, cursor); err != nil { return fmt.Errorf("cannot load mailing list subscribers: %w", err) } @@ -427,11 +427,11 @@ func (s *Service) CreateMailingListUpdate( UpdatedAt: now, } - err := s.pg.WithConn( + err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var ml coredata.MailingList - if err := ml.LoadByID(ctx, conn, scope, mailingListID); err != nil { + if err := ml.LoadByID(ctx, tx, scope, mailingListID); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { return ErrMailingListNotFound } @@ -440,7 +440,7 @@ func (s *Service) CreateMailingListUpdate( mlu.OrganizationID = ml.OrganizationID - if err := mlu.Insert(ctx, conn, scope); err != nil { + if err := mlu.Insert(ctx, tx, scope); err != nil { return fmt.Errorf("cannot insert mailing list update: %w", err) } @@ -463,7 +463,7 @@ func (s *Service) GetMailingListUpdate( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := mlu.LoadByID(ctx, conn, scope, id); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { return ErrMailingListUpdateNotFound @@ -491,10 +491,10 @@ func (s *Service) UpdateMailingListUpdate( scope := coredata.NewScopeFromObjectID(req.ID) var mlu coredata.MailingListUpdate - err := s.pg.WithConn( + err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := mlu.LoadByID(ctx, conn, scope, req.ID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := mlu.LoadByID(ctx, tx, scope, req.ID); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { return ErrMailingListUpdateNotFound } @@ -513,7 +513,7 @@ func (s *Service) UpdateMailingListUpdate( } mlu.UpdatedAt = time.Now() - if err := mlu.Update(ctx, conn, scope); err != nil { + if err := mlu.Update(ctx, tx, scope); err != nil { return fmt.Errorf("cannot update mailing list update: %w", err) } @@ -534,10 +534,10 @@ func (s *Service) SendMailingListUpdate( scope := coredata.NewScopeFromObjectID(id) var mlu coredata.MailingListUpdate - err := s.pg.WithConn( + err := s.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := mlu.LoadByID(ctx, conn, scope, id); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := mlu.LoadByID(ctx, tx, scope, id); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { return ErrMailingListUpdateNotFound } @@ -551,7 +551,7 @@ func (s *Service) SendMailingListUpdate( mlu.Status = coredata.MailingListUpdateStatusEnqueued mlu.UpdatedAt = time.Now() - if err := mlu.Update(ctx, conn, scope); err != nil { + if err := mlu.Update(ctx, tx, scope); err != nil { return fmt.Errorf("cannot queue mailing list update for sending: %w", err) } @@ -571,11 +571,11 @@ func (s *Service) DeleteMailingListUpdate( ) error { scope := coredata.NewScopeFromObjectID(id) - return s.pg.WithConn( + return s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { mlu := coredata.MailingListUpdate{ID: id} - if err := mlu.Delete(ctx, conn, scope); err != nil { + if err := mlu.Delete(ctx, tx, scope); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { return ErrMailingListUpdateNotFound } @@ -596,7 +596,7 @@ func (s *Service) ListMailingListUpdates( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := items.LoadByMailingListID(ctx, conn, scope, mailingListID, cursor); err != nil { return fmt.Errorf("cannot load mailing list updates: %w", err) } @@ -620,7 +620,7 @@ func (s *Service) ListSentMailingListUpdates( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := items.LoadSentByMailingListID(ctx, conn, scope, mailingListID, cursor); err != nil { return fmt.Errorf("cannot load sent mailing list updates: %w", err) } @@ -643,7 +643,7 @@ func (s *Service) CountMailingListUpdates( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var items coredata.MailingListUpdateItems var err error count, err = items.CountByMailingListID(ctx, conn, scope, mailingListID) @@ -676,7 +676,7 @@ func (s *Service) CreateUpdateEmails( return s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var subscribers coredata.MailingListSubscribers if err := subscribers.LoadAllConfirmedByMailingListID(ctx, tx, scope, mailingListID); err != nil { return fmt.Errorf("cannot load confirmed subscribers: %w", err) diff --git a/pkg/probo/asset_service.go b/pkg/probo/asset_service.go index fb4ca4480..952ff556d 100644 --- a/pkg/probo/asset_service.go +++ b/pkg/probo/asset_service.go @@ -90,7 +90,7 @@ func (s AssetService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return asset.LoadByID(ctx, conn, s.svc.scope, assetID) }, ) @@ -110,7 +110,7 @@ func (s AssetService) GetByOwnerID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return asset.LoadByOwnerID(ctx, conn, s.svc.scope) }, ) @@ -131,7 +131,7 @@ func (s AssetService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { assets := coredata.Assets{} count, err = assets.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) if err != nil { @@ -159,7 +159,7 @@ func (s AssetService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return assets.LoadByOrganizationID( ctx, conn, @@ -190,7 +190,7 @@ func (s AssetService) Update( asset := &coredata.Asset{ID: req.ID} assetVendors := &coredata.AssetVendors{} - err := s.svc.pg.WithTx(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, conn pg.Tx) error { if err := asset.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load asset: %w", err) } @@ -260,7 +260,7 @@ func (s AssetService) Create( UpdatedAt: now, } - err := s.svc.pg.WithTx(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, conn pg.Tx) error { profile := &coredata.MembershipProfile{} if err := profile.LoadByID(ctx, conn, s.svc.scope, req.OwnerID); err != nil { return fmt.Errorf("cannot load owner profile: %w", err) @@ -292,10 +292,10 @@ func (s AssetService) Delete( ) error { asset := &coredata.Asset{ID: assetID} - return s.svc.pg.WithConn( + return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - return asset.Delete(ctx, conn, s.svc.scope) + func(ctx context.Context, tx pg.Tx) error { + return asset.Delete(ctx, tx, s.svc.scope) }, ) } diff --git a/pkg/probo/audit_service.go b/pkg/probo/audit_service.go index accc5c003..1899fdf1c 100644 --- a/pkg/probo/audit_service.go +++ b/pkg/probo/audit_service.go @@ -111,7 +111,7 @@ func (s AuditService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return audit.LoadByID(ctx, conn, s.svc.scope, auditID) }, ) @@ -131,7 +131,7 @@ func (s AuditService) GetByReportID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return audit.LoadByReportID(ctx, conn, s.svc.scope, reportID) }, ) @@ -175,7 +175,7 @@ func (s *AuditService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -212,7 +212,7 @@ func (s *AuditService) Update( audit := &coredata.Audit{} err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := audit.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load audit: %w", err) } @@ -255,10 +255,10 @@ func (s AuditService) Delete( auditID gid.GID, ) error { audit := coredata.Audit{ID: auditID} - return s.svc.pg.WithConn( + return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - err := audit.Delete(ctx, conn, s.svc.scope) + func(ctx context.Context, tx pg.Tx) error { + err := audit.Delete(ctx, tx, s.svc.scope) if err != nil { return fmt.Errorf("cannot delete audit: %w", err) } @@ -276,7 +276,7 @@ func (s AuditService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { filter := coredata.NewAuditFilter() err := audits.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor, filter) if err != nil { @@ -302,7 +302,7 @@ func (s AuditService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { audits := coredata.Audits{} count, err = audits.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID) if err != nil { @@ -332,7 +332,7 @@ func (s AuditService) UploadReport( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := audit.LoadByID(ctx, conn, s.svc.scope, req.AuditID); err != nil { return fmt.Errorf("cannot load audit: %w", err) } @@ -424,7 +424,7 @@ func (s AuditService) DeleteReport( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := audit.LoadByID(ctx, conn, s.svc.scope, auditID); err != nil { return fmt.Errorf("cannot load audit: %w", err) } @@ -465,7 +465,7 @@ func (s AuditService) ListForControlID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } @@ -494,7 +494,7 @@ func (s AuditService) CountForControlID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { audits := coredata.Audits{} count, err = audits.CountByControlID(ctx, conn, s.svc.scope, controlID) if err != nil { @@ -520,7 +520,7 @@ func (s AuditService) CountForFindingID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { audits := coredata.Audits{} count, err = audits.CountByFindingID(ctx, conn, s.svc.scope, findingID) if err != nil { @@ -548,7 +548,7 @@ func (s AuditService) ListForFindingID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := finding.LoadByID(ctx, conn, s.svc.scope, findingID); err != nil { return fmt.Errorf("cannot load finding: %w", err) } diff --git a/pkg/probo/compliance_external_url_service.go b/pkg/probo/compliance_external_url_service.go index d15c84862..249a1c6c7 100644 --- a/pkg/probo/compliance_external_url_service.go +++ b/pkg/probo/compliance_external_url_service.go @@ -79,7 +79,7 @@ func (s ComplianceExternalURLService) List( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := items.LoadByTrustCenterID(ctx, conn, s.svc.scope, trustCenterID, cursor); err != nil { return fmt.Errorf("cannot load compliance external URLs: %w", err) } @@ -108,7 +108,7 @@ func (s ComplianceExternalURLService) Create( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { trustCenter := &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, tx, s.svc.scope, req.TrustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -150,7 +150,7 @@ func (s ComplianceExternalURLService) Update( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { item = &coredata.ComplianceExternalURL{} if err := item.LoadByID(ctx, tx, s.svc.scope, req.ID); err != nil { @@ -192,7 +192,7 @@ func (s ComplianceExternalURLService) Delete( return s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { item := &coredata.ComplianceExternalURL{} if err := item.LoadByID(ctx, tx, s.svc.scope, req.ID); err != nil { diff --git a/pkg/probo/compliance_framework_service.go b/pkg/probo/compliance_framework_service.go index 28aee7b04..d3b24dfc0 100644 --- a/pkg/probo/compliance_framework_service.go +++ b/pkg/probo/compliance_framework_service.go @@ -80,7 +80,7 @@ func (s ComplianceFrameworkService) ListWithHiddenForTrustCenterID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := cfs.LoadWithHiddenByTrustCenterID(ctx, conn, s.svc.scope, trustCenterID, cursor); err != nil { return fmt.Errorf("cannot load compliance frameworks with hidden: %w", err) } @@ -110,7 +110,7 @@ func (s ComplianceFrameworkService) Create( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { trustCenter := &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, tx, s.svc.scope, req.TrustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -152,7 +152,7 @@ func (s ComplianceFrameworkService) Update( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { cf = &coredata.ComplianceFramework{} if err := cf.LoadByID(ctx, tx, s.svc.scope, req.ID); err != nil { @@ -187,7 +187,7 @@ func (s ComplianceFrameworkService) Delete( return s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { cf := &coredata.ComplianceFramework{} if err := cf.LoadByID(ctx, tx, s.svc.scope, req.ID); err != nil { diff --git a/pkg/probo/connector_service.go b/pkg/probo/connector_service.go index ef422bef2..8b1f6c6ed 100644 --- a/pkg/probo/connector_service.go +++ b/pkg/probo/connector_service.go @@ -81,7 +81,7 @@ func (s *ConnectorService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return connectors.LoadByOrganizationIDWithoutDecryptedConnection( ctx, conn, @@ -108,7 +108,7 @@ func (s *ConnectorService) ListAllForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return connectors.LoadAllByOrganizationIDWithoutDecryptedConnection( ctx, conn, @@ -133,7 +133,7 @@ func (s *ConnectorService) GetByOrganizationIDAndProvider( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return connectors.LoadAllByOrganizationIDProtocolAndProvider( ctx, conn, @@ -165,7 +165,7 @@ func (s *ConnectorService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return connector.LoadMetadataByID(ctx, conn, s.svc.scope, connectorID) }, ) @@ -180,11 +180,11 @@ func (s *ConnectorService) Delete( ctx context.Context, connectorID gid.GID, ) error { - return s.svc.pg.WithConn( + return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { cnnctr := &coredata.Connector{ID: connectorID} - return cnnctr.Delete(ctx, conn, s.svc.scope) + return cnnctr.Delete(ctx, tx, s.svc.scope) }, ) } @@ -237,10 +237,10 @@ func (s *ConnectorService) Create( } } - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := newConnector.Insert(ctx, conn, s.svc.scope, s.svc.encryptionKey); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := newConnector.Insert(ctx, tx, s.svc.scope, s.svc.encryptionKey); err != nil { return fmt.Errorf("cannot create connector: %w", err) } @@ -248,7 +248,7 @@ func (s *ConnectorService) Create( slackConn, ok := req.Connection.(*connector.SlackConnection) if ok && slackConn.Settings.Channel != "" { var organization coredata.Organization - if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { + if err := organization.LoadByID(ctx, tx, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -271,7 +271,7 @@ func (s *ConnectorService) Create( } slackMessage := coredata.NewSlackMessage(s.svc.scope, req.OrganizationID, coredata.SlackMessageTypeWelcome, body) - if err := slackMessage.Insert(ctx, conn, s.svc.scope); err != nil { + if err := slackMessage.Insert(ctx, tx, s.svc.scope); err != nil { return fmt.Errorf("cannot insert slack message: %w", err) } } @@ -298,7 +298,7 @@ func (s *ConnectorService) Reconnect( ) (*coredata.Connector, error) { cnnctr := &coredata.Connector{} - err := s.svc.pg.WithTx(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, conn pg.Tx) error { if err := cnnctr.LoadMetadataByID(ctx, conn, s.svc.scope, connectorID); err != nil { return fmt.Errorf("cannot load connector: %w", err) } diff --git a/pkg/probo/control_service.go b/pkg/probo/control_service.go index 0ce555808..c2aa75555 100644 --- a/pkg/probo/control_service.go +++ b/pkg/probo/control_service.go @@ -104,7 +104,7 @@ func (s ControlService) CountForDocumentID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { controls := &coredata.Controls{} count, err = controls.CountByDocumentID(ctx, conn, s.svc.scope, documentID, filter) if err != nil { @@ -133,7 +133,7 @@ func (s ControlService) ListForDocumentID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := document.LoadByID(ctx, conn, s.svc.scope, documentID); err != nil { return fmt.Errorf("cannot load document: %w", err) } @@ -158,7 +158,7 @@ func (s ControlService) CountForMeasureID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { controls := &coredata.Controls{} count, err = controls.CountByMeasureID(ctx, conn, s.svc.scope, measureID, filter) if err != nil { @@ -187,7 +187,7 @@ func (s ControlService) ListForMeasureID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := measure.LoadByID(ctx, conn, s.svc.scope, measureID); err != nil { return fmt.Errorf("cannot load measure: %w", err) } @@ -212,7 +212,7 @@ func (s ControlService) CountForFrameworkID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { controls := &coredata.Controls{} count, err = controls.CountByFrameworkID(ctx, conn, s.svc.scope, frameworkID, filter) if err != nil { @@ -241,7 +241,7 @@ func (s ControlService) ListForFrameworkID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := framework.LoadByID(ctx, conn, s.svc.scope, frameworkID); err != nil { return fmt.Errorf("cannot load framework: %w", err) } @@ -273,7 +273,7 @@ func (s ControlService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { controls := &coredata.Controls{} count, err = controls.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) if err != nil { @@ -302,7 +302,7 @@ func (s ControlService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -334,7 +334,7 @@ func (s ControlService) CountForRiskID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { controls := &coredata.Controls{} count, err = controls.CountByRiskID(ctx, conn, s.svc.scope, riskID, filter) if err != nil { @@ -363,7 +363,7 @@ func (s ControlService) ListForRiskID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := risk.LoadByID(ctx, conn, s.svc.scope, riskID); err != nil { return fmt.Errorf("cannot load risk: %w", err) } @@ -389,7 +389,7 @@ func (s ControlService) CreateMeasureMapping( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } @@ -425,19 +425,19 @@ func (s ControlService) DeleteMeasureMapping( control := &coredata.Control{} measure := &coredata.Measure{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := control.LoadByID(ctx, tx, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } - if err := measure.LoadByID(ctx, conn, s.svc.scope, measureID); err != nil { + if err := measure.LoadByID(ctx, tx, s.svc.scope, measureID); err != nil { return fmt.Errorf("cannot load measure: %w", err) } controlMeasure := &coredata.ControlMeasure{} - if err := controlMeasure.Delete(ctx, conn, s.svc.scope, control.ID, measure.ID); err != nil { + if err := controlMeasure.Delete(ctx, tx, s.svc.scope, control.ID, measure.ID); err != nil { return fmt.Errorf("cannot delete control measure mapping: %w", err) } @@ -460,14 +460,14 @@ func (s ControlService) CreateDocumentMapping( control := &coredata.Control{} document := &coredata.Document{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := control.LoadByID(ctx, tx, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } - if err := document.LoadByID(ctx, conn, s.svc.scope, documentID); err != nil { + if err := document.LoadByID(ctx, tx, s.svc.scope, documentID); err != nil { return fmt.Errorf("cannot load document: %w", err) } @@ -479,7 +479,7 @@ func (s ControlService) CreateDocumentMapping( CreatedAt: time.Now(), } - if err := controlDocument.Insert(ctx, conn, s.svc.scope); err != nil { + if err := controlDocument.Insert(ctx, tx, s.svc.scope); err != nil { return fmt.Errorf("cannot insert control document: %w", err) } @@ -502,19 +502,19 @@ func (s ControlService) DeleteDocumentMapping( control := &coredata.Control{} document := &coredata.Document{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := control.LoadByID(ctx, tx, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } - if err := document.LoadByID(ctx, conn, s.svc.scope, documentID); err != nil { + if err := document.LoadByID(ctx, tx, s.svc.scope, documentID); err != nil { return fmt.Errorf("cannot load document: %w", err) } controlDocument := &coredata.ControlDocument{} - if err := controlDocument.Delete(ctx, conn, s.svc.scope, control.ID, document.ID); err != nil { + if err := controlDocument.Delete(ctx, tx, s.svc.scope, control.ID, document.ID); err != nil { return fmt.Errorf("cannot delete control document mapping: %w", err) } @@ -539,7 +539,7 @@ func (s ControlService) CreateAuditMapping( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } @@ -578,19 +578,19 @@ func (s ControlService) DeleteAuditMapping( control := &coredata.Control{} audit := &coredata.Audit{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := control.LoadByID(ctx, tx, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } - if err := audit.LoadByID(ctx, conn, s.svc.scope, auditID); err != nil { + if err := audit.LoadByID(ctx, tx, s.svc.scope, auditID); err != nil { return fmt.Errorf("cannot load audit: %w", err) } controlAudit := &coredata.ControlAudit{} - if err := controlAudit.Delete(ctx, conn, s.svc.scope, control.ID, audit.ID); err != nil { + if err := controlAudit.Delete(ctx, tx, s.svc.scope, control.ID, audit.ID); err != nil { return fmt.Errorf("cannot delete control audit mapping: %w", err) } @@ -615,7 +615,7 @@ func (s ControlService) CreateObligationMapping( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } @@ -653,19 +653,19 @@ func (s ControlService) DeleteObligationMapping( control := &coredata.Control{} obligation := &coredata.Obligation{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := control.LoadByID(ctx, tx, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } - if err := obligation.LoadByID(ctx, conn, s.svc.scope, obligationID); err != nil { + if err := obligation.LoadByID(ctx, tx, s.svc.scope, obligationID); err != nil { return fmt.Errorf("cannot load obligation: %w", err) } controlObligation := &coredata.ControlObligation{} - if err := controlObligation.Delete(ctx, conn, s.svc.scope, control.ID, obligation.ID); err != nil { + if err := controlObligation.Delete(ctx, tx, s.svc.scope, control.ID, obligation.ID); err != nil { return fmt.Errorf("cannot delete control obligation mapping: %w", err) } @@ -691,7 +691,7 @@ func (s ControlService) ListForAuditID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := audit.LoadByID(ctx, conn, s.svc.scope, auditID); err != nil { return fmt.Errorf("cannot load audit: %w", err) } @@ -720,7 +720,7 @@ func (s ControlService) CreateSnapshotMapping( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } @@ -759,19 +759,19 @@ func (s ControlService) DeleteSnapshotMapping( control := &coredata.Control{} snapshot := &coredata.Snapshot{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := control.LoadByID(ctx, tx, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } - if err := snapshot.LoadByID(ctx, conn, s.svc.scope, snapshotID); err != nil { + if err := snapshot.LoadByID(ctx, tx, s.svc.scope, snapshotID); err != nil { return fmt.Errorf("cannot load snapshot: %w", err) } controlSnapshot := &coredata.ControlSnapshot{} - if err := controlSnapshot.Delete(ctx, conn, s.svc.scope, control.ID, snapshot.ID); err != nil { + if err := controlSnapshot.Delete(ctx, tx, s.svc.scope, control.ID, snapshot.ID); err != nil { return fmt.Errorf("cannot delete control snapshot mapping: %w", err) } @@ -797,7 +797,7 @@ func (s ControlService) ListForSnapshotID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := snapshot.LoadByID(ctx, conn, s.svc.scope, snapshotID); err != nil { return fmt.Errorf("cannot load snapshot: %w", err) } @@ -825,7 +825,7 @@ func (s ControlService) CountForStateOfApplicabilityID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { controls := &coredata.Controls{} count, err = controls.CountByStateOfApplicabilityID(ctx, conn, s.svc.scope, stateOfApplicabilityID, filter) if err != nil { @@ -874,7 +874,7 @@ func (s ControlService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := framework.LoadByID(ctx, conn, s.svc.scope, req.FrameworkID); err != nil { return fmt.Errorf("cannot load framework: %w", err) } @@ -901,7 +901,7 @@ func (s ControlService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return control.LoadByID(ctx, conn, s.svc.scope, controlID) }, ) @@ -921,7 +921,7 @@ func (s ControlService) GetByIDs( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := controls.LoadByIDs( ctx, conn, @@ -953,7 +953,7 @@ func (s ControlService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := control.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load control: %w", err) } @@ -1003,10 +1003,10 @@ func (s ControlService) Delete( ) error { control := &coredata.Control{ID: controlID} - return s.svc.pg.WithConn( + return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - return control.Delete(ctx, conn, s.svc.scope) + func(ctx context.Context, tx pg.Tx) error { + return control.Delete(ctx, tx, s.svc.scope) }, ) } @@ -1022,7 +1022,7 @@ func (s ControlService) HasRegulatoryObligation( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var controlObligations coredata.ControlObligations count, err := controlObligations.CountByControlID(ctx, conn, s.svc.scope, controlID, filter) if err != nil { @@ -1047,7 +1047,7 @@ func (s ControlService) HasContractualObligation( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var controlObligations coredata.ControlObligations count, err := controlObligations.CountByControlID(ctx, conn, s.svc.scope, controlID, filter) if err != nil { @@ -1069,7 +1069,7 @@ func (s ControlService) HasRiskAssessment( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var controlsWithRisk coredata.ControlsWithRisk if err := controlsWithRisk.LoadByControlIDs(ctx, conn, s.svc.scope, []gid.GID{controlID}); err != nil { return fmt.Errorf("cannot load controls with risk: %w", err) diff --git a/pkg/probo/custom_domain_service.go b/pkg/probo/custom_domain_service.go index 4e17cc296..398bfb31a 100644 --- a/pkg/probo/custom_domain_service.go +++ b/pkg/probo/custom_domain_service.go @@ -62,7 +62,7 @@ func (s *CustomDomainService) CreateCustomDomain( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { domain = coredata.NewCustomDomain(s.svc.scope.GetTenantID(), req.Domain) domain.OrganizationID = req.OrganizationID @@ -97,7 +97,7 @@ func (s *CustomDomainService) DeleteCustomDomain( ) error { return s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var org coredata.Organization if err := org.LoadByID(ctx, tx, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -134,7 +134,7 @@ func (s *CustomDomainService) GetOrganizationCustomDomain( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var org coredata.Organization if err := org.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) diff --git a/pkg/probo/data_protection_impact_assessment_service.go b/pkg/probo/data_protection_impact_assessment_service.go index ceb72018e..120eefa72 100644 --- a/pkg/probo/data_protection_impact_assessment_service.go +++ b/pkg/probo/data_protection_impact_assessment_service.go @@ -88,7 +88,7 @@ func (s DataProtectionImpactAssessmentService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := dpia.LoadByID(ctx, conn, s.svc.scope, dpiaID); err != nil { return fmt.Errorf("cannot load data protection impact assessment: %w", err) } @@ -112,7 +112,7 @@ func (s DataProtectionImpactAssessmentService) GetByProcessingActivityID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := dpia.LoadByProcessingActivityID(ctx, conn, s.svc.scope, processingActivityID); err != nil { return fmt.Errorf("cannot load data protection impact assessment: %w", err) } @@ -138,7 +138,7 @@ func (s DataProtectionImpactAssessmentService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := dpias.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor, filter) if err != nil { return fmt.Errorf("cannot load data protection impact assessments: %w", err) @@ -164,7 +164,7 @@ func (s DataProtectionImpactAssessmentService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { dpias := coredata.DataProtectionImpactAssessments{} count, err = dpias.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) return err @@ -202,7 +202,7 @@ func (s *DataProtectionImpactAssessmentService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { processingActivity := &coredata.ProcessingActivity{} if err := processingActivity.LoadByID(ctx, conn, s.svc.scope, req.ProcessingActivityID); err != nil { return fmt.Errorf("cannot load processing activity: %w", err) @@ -237,7 +237,7 @@ func (s *DataProtectionImpactAssessmentService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := dpia.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load data protection impact assessment: %w", err) } @@ -285,7 +285,7 @@ func (s *DataProtectionImpactAssessmentService) Delete( ) error { err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { dpia := &coredata.DataProtectionImpactAssessment{} if err := dpia.LoadByID(ctx, conn, s.svc.scope, dpiaID); err != nil { return fmt.Errorf("cannot load data protection impact assessment: %w", err) @@ -311,7 +311,7 @@ func (s *DataProtectionImpactAssessmentService) ExportPDF( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { var assessments coredata.DataProtectionImpactAssessments if err := assessments.LoadAllByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter); err != nil { return fmt.Errorf("cannot load data protection impact assessments: %w", err) diff --git a/pkg/probo/datum_service.go b/pkg/probo/datum_service.go index 4fc6ddc31..2d4e2606a 100644 --- a/pkg/probo/datum_service.go +++ b/pkg/probo/datum_service.go @@ -84,7 +84,7 @@ func (s DatumService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return datum.LoadByID(ctx, conn, s.svc.scope, datumID) }, ) @@ -104,7 +104,7 @@ func (s DatumService) GetByOwnerID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return datum.LoadByOwnerID(ctx, conn, s.svc.scope) }, ) @@ -125,7 +125,7 @@ func (s DatumService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { data := coredata.Data{} count, err = data.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) if err != nil { @@ -153,7 +153,7 @@ func (s DatumService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return data.LoadByOrganizationID( ctx, conn, @@ -184,7 +184,7 @@ func (s DatumService) Update( datum := &coredata.Datum{} datumVendors := &coredata.DatumVendors{} - err := s.svc.pg.WithTx(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, conn pg.Tx) error { if err := datum.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load data: %w", err) } @@ -248,7 +248,7 @@ func (s DatumService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { owner := &coredata.MembershipProfile{} if err := owner.LoadByID(ctx, conn, s.svc.scope, req.OwnerID); err != nil { return fmt.Errorf("cannot load owner profile: %w", err) @@ -281,10 +281,10 @@ func (s DatumService) Delete( ) error { datum := &coredata.Datum{ID: datumID} - return s.svc.pg.WithConn( + return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - return datum.Delete(ctx, conn, s.svc.scope) + func(ctx context.Context, tx pg.Tx) error { + return datum.Delete(ctx, tx, s.svc.scope) }, ) } @@ -298,7 +298,7 @@ func (s DatumService) ListVendors( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return vendors.LoadByDatumID(ctx, conn, s.svc.scope, datumID, cursor) }, ) diff --git a/pkg/probo/document_approval_service.go b/pkg/probo/document_approval_service.go index 4881f7ab7..a5558da33 100644 --- a/pkg/probo/document_approval_service.go +++ b/pkg/probo/document_approval_service.go @@ -106,7 +106,7 @@ func (s *DocumentApprovalService) RequestApproval( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { document := &coredata.Document{} if err := document.LoadByID(ctx, tx, s.svc.scope, req.DocumentID); err != nil { return fmt.Errorf("cannot load document: %w", err) @@ -194,7 +194,7 @@ func (s *DocumentApprovalService) Approve( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { documentVersion = &coredata.DocumentVersion{} if err := documentVersion.LoadByID(ctx, conn, s.svc.scope, req.DocumentVersionID); err != nil { return fmt.Errorf("cannot load document version: %w", err) @@ -271,7 +271,7 @@ func (s *DocumentApprovalService) Approve( err = s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { decision = &coredata.DocumentVersionApprovalDecision{} if err := decision.LoadByQuorumIDAndApproverID(ctx, tx, s.svc.scope, quorum.ID, approverID); err != nil { return fmt.Errorf("cannot load approval decision: %w", err) @@ -337,7 +337,7 @@ func (s *DocumentApprovalService) Reject( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { documentVersion := &coredata.DocumentVersion{} if err := documentVersion.LoadByID(ctx, tx, s.svc.scope, req.DocumentVersionID); err != nil { return fmt.Errorf("cannot load document version: %w", err) @@ -395,7 +395,7 @@ func (s *DocumentApprovalService) AddApprover( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { documentVersion := &coredata.DocumentVersion{} if err := documentVersion.LoadByID(ctx, tx, s.svc.scope, documentVersionID); err != nil { return fmt.Errorf("cannot load document version: %w", err) @@ -471,7 +471,7 @@ func (s *DocumentApprovalService) RemoveApprover( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { decision := &coredata.DocumentVersionApprovalDecision{} if err := decision.LoadByID(ctx, tx, s.svc.scope, approvalDecisionID); err != nil { return fmt.Errorf("cannot load approval decision: %w", err) @@ -527,7 +527,7 @@ func (s *DocumentApprovalService) GetQuorum( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := quorum.LoadByID(ctx, conn, s.svc.scope, quorumID); err != nil { return fmt.Errorf("cannot load approval quorum: %w", err) } @@ -551,7 +551,7 @@ func (s *DocumentApprovalService) ListQuorums( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := quorums.LoadAllByDocumentVersionID(ctx, conn, s.svc.scope, documentVersionID, cursor); err != nil { return fmt.Errorf("cannot list approval quorums: %w", err) } @@ -574,7 +574,7 @@ func (s *DocumentApprovalService) CountQuorums( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { quorums := &coredata.DocumentVersionApprovalQuorums{} count, err = quorums.CountByDocumentVersionID(ctx, conn, s.svc.scope, documentVersionID) if err != nil { @@ -601,7 +601,7 @@ func (s *DocumentApprovalService) ListDecisions( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := decisions.LoadByQuorumID(ctx, conn, s.svc.scope, quorumID, cursor, filter); err != nil { return fmt.Errorf("cannot list approval decisions: %w", err) } @@ -625,7 +625,7 @@ func (s *DocumentApprovalService) CountDecisions( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { decisions := &coredata.DocumentVersionApprovalDecisions{} count, err = decisions.CountByQuorumID(ctx, conn, s.svc.scope, quorumID, filter) if err != nil { @@ -651,7 +651,7 @@ func (s *DocumentApprovalService) GetViewerDecision( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { documentVersion := &coredata.DocumentVersion{} if err := documentVersion.LoadByID(ctx, conn, s.svc.scope, documentVersionID); err != nil { return fmt.Errorf("cannot load document version: %w", err) @@ -692,7 +692,7 @@ func (s *DocumentApprovalService) GetViewerDecision( func (s *DocumentApprovalService) loadLatestVersion( ctx context.Context, - conn pg.Conn, + conn pg.Querier, documentID gid.GID, ) (*coredata.DocumentVersion, error) { version := &coredata.DocumentVersion{} @@ -705,7 +705,7 @@ func (s *DocumentApprovalService) loadLatestVersion( func (s *DocumentApprovalService) loadQuorumAndProfile( ctx context.Context, - conn pg.Conn, + conn pg.Querier, documentVersionID gid.GID, identityID gid.GID, organizationID gid.GID, @@ -728,7 +728,7 @@ func (s *DocumentApprovalService) loadQuorumAndProfile( func (s *DocumentApprovalService) rejectPendingQuorum( ctx context.Context, - tx pg.Conn, + tx pg.Tx, documentVersionID gid.GID, ) error { existingQuorum := &coredata.DocumentVersionApprovalQuorum{} @@ -756,7 +756,7 @@ func (s *DocumentApprovalService) rejectPendingQuorum( func (s *DocumentApprovalService) createDecisions( ctx context.Context, - tx pg.Conn, + tx pg.Tx, quorum *coredata.DocumentVersionApprovalQuorum, organizationID gid.GID, approverIDs []gid.GID, @@ -784,7 +784,7 @@ func (s *DocumentApprovalService) createDecisions( func (s *DocumentApprovalService) sendApprovalEmails( ctx context.Context, - tx pg.Conn, + tx pg.Tx, profiles coredata.MembershipProfiles, document *coredata.Document, organization *coredata.Organization, @@ -870,7 +870,7 @@ func (s *DocumentApprovalService) generateApprovalPDF( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var err error pdfData, err = exportDocumentPDF( ctx, @@ -890,7 +890,7 @@ func (s *DocumentApprovalService) generateApprovalPDF( func (s *DocumentApprovalService) countDecisions( ctx context.Context, - conn pg.Conn, + conn pg.Querier, quorumID gid.GID, ) (int, error) { decisions := &coredata.DocumentVersionApprovalDecisions{} @@ -910,7 +910,7 @@ func (s *DocumentApprovalService) countDecisions( func (s *DocumentApprovalService) maybeApproveQuorum( ctx context.Context, - tx pg.Conn, + tx pg.Tx, quorumID gid.GID, ) error { totalCount, err := s.countDecisions(ctx, tx, quorumID) @@ -952,7 +952,7 @@ func (s *DocumentApprovalService) maybeApproveQuorum( func (s *DocumentApprovalService) publishVersion( ctx context.Context, - tx pg.Conn, + tx pg.Tx, versionID gid.GID, ) error { version := &coredata.DocumentVersion{} diff --git a/pkg/probo/document_service.go b/pkg/probo/document_service.go index 186ac00ce..091561c1a 100644 --- a/pkg/probo/document_service.go +++ b/pkg/probo/document_service.go @@ -206,7 +206,7 @@ func (s *DocumentService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return document.LoadByID(ctx, conn, s.svc.scope, documentID) }, ) @@ -226,7 +226,7 @@ func (s *DocumentService) GetByIDs( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := documents.LoadByIDs( ctx, conn, @@ -255,7 +255,7 @@ func (s *DocumentService) ListVersionApprovers( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := profiles.LoadByDocumentVersionID(ctx, conn, s.svc.scope, documentVersionID, cursor); err != nil { return fmt.Errorf("cannot load document version approvers: %w", err) } @@ -279,7 +279,7 @@ func (s *DocumentService) CountVersionApprovers( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { profiles := coredata.MembershipProfiles{} count, err = profiles.CountByDocumentVersionID(ctx, conn, s.svc.scope, documentVersionID) if err != nil { @@ -306,7 +306,7 @@ func (s *DocumentService) GetWithFilter( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := document.LoadByIDWithFilter(ctx, conn, s.svc.scope, documentID, filter) if err != nil { return fmt.Errorf("cannot load document: %w", err) @@ -333,7 +333,7 @@ func (s DocumentService) GenerateChangelog( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := draftVersion.LoadLatestVersion(ctx, conn, s.svc.scope, documentID); err != nil { return fmt.Errorf("cannot load draft version: %w", err) } @@ -388,7 +388,7 @@ func (s *DocumentService) BulkPublishMajorVersions( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { for _, documentID := range req.DocumentIDs { document, version, err := s.publishMajorVersionInTx(ctx, tx, documentID, &req.Changelog, true) if err != nil { @@ -419,7 +419,7 @@ func (s *DocumentService) BulkPublishMinorVersions( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { for _, documentID := range req.DocumentIDs { document, version, err := s.publishMinorVersionInTx(ctx, tx, documentID, &req.Changelog, true) if err != nil { @@ -452,7 +452,7 @@ func (s *DocumentService) PublishMajorVersion( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var err error document, documentVersion, err = s.publishMajorVersionInTx(ctx, tx, documentID, changelog, false) @@ -482,7 +482,7 @@ func (s *DocumentService) PublishMinorVersion( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var err error document, documentVersion, err = s.publishMinorVersionInTx(ctx, tx, documentID, changelog, false) @@ -553,7 +553,7 @@ func (s *DocumentService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -589,7 +589,7 @@ func (s *DocumentService) SendSigningNotifications( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { var signatories coredata.MembershipProfiles if err := signatories.LoadAwaitingSigning(ctx, tx, s.svc.scope); err != nil { return fmt.Errorf("cannot load signatories: %w", err) @@ -685,7 +685,7 @@ func (s *DocumentService) SignDocumentVersionByIdentity( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { documentVersion := &coredata.DocumentVersion{} if err := documentVersion.LoadByID(ctx, conn, s.svc.scope, documentVersionID); err != nil { return fmt.Errorf("cannot get document version: %w", err) @@ -712,7 +712,7 @@ func (s *DocumentService) SignDocumentVersionByIdentity( func (s *DocumentService) signDocumentVersionInTx( ctx context.Context, - conn pg.Conn, + conn pg.Tx, documentVersionID gid.GID, signatory gid.GID, ) (*coredata.DocumentVersionSignature, error) { @@ -764,7 +764,7 @@ func (s *DocumentService) UpdateVersion( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := documentVersion.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load document version %q: %w", req.ID, err) } @@ -821,7 +821,7 @@ func (s *DocumentService) GetVersionSignature( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return documentVersionSignature.LoadByID(ctx, conn, s.svc.scope, signatureID) }, ) @@ -841,7 +841,7 @@ func (s *DocumentService) BulkRequestSignatures( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { for _, documentID := range req.DocumentIDs { documentVersion := &coredata.DocumentVersion{} if err := documentVersion.LoadLatestVersion(ctx, tx, s.svc.scope, documentID); err != nil { @@ -873,7 +873,7 @@ func (s *DocumentService) BulkRequestSignatures( func (s *DocumentService) createSignatureRequestInTx( ctx context.Context, - tx pg.Conn, + tx pg.Tx, documentVersionID gid.GID, signatoryID gid.GID, ignoreExisting bool, @@ -932,7 +932,7 @@ func (s *DocumentService) RequestSignature( var signature *coredata.DocumentVersionSignature err = s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { signature, err = s.createSignatureRequestInTx(ctx, tx, req.DocumentVersionID, req.Signatory, false) if err != nil { return fmt.Errorf("cannot create signature request: %w", err) @@ -959,7 +959,7 @@ func (s *DocumentService) ListSignatures( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return documentVersionSignatures.LoadByDocumentVersionID(ctx, conn, s.svc.scope, documentVersionID, cursor, filter) }, ) @@ -981,7 +981,7 @@ func (s *DocumentService) IsVersionSignedByUserEmail( var signed bool err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var err error signed, err = documentVersionSignature.IsSignedByUserEmail( ctx, @@ -1014,7 +1014,7 @@ func (s *DocumentService) CreateDraft( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := document.LoadByID(ctx, conn, s.svc.scope, documentID); err != nil { return fmt.Errorf("cannot load document: %w", err) } @@ -1063,7 +1063,7 @@ func (s *DocumentService) DeleteDraft( return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := documentVersion.LoadByID(ctx, conn, s.svc.scope, documentVersionID); err != nil { return fmt.Errorf("cannot load document version: %w", err) } @@ -1091,10 +1091,10 @@ func (s *DocumentService) SoftDelete( ) error { document := coredata.Document{ID: documentID} - return s.svc.pg.WithConn( + return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - return document.SoftDelete(ctx, conn, s.svc.scope) + func(ctx context.Context, tx pg.Tx) error { + return document.SoftDelete(ctx, tx, s.svc.scope) }, ) } @@ -1109,10 +1109,10 @@ func (s *DocumentService) BulkSoftDelete( documents = append(documents, &coredata.Document{ID: documentID}) } - return s.svc.pg.WithConn( + return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - return documents.BulkSoftDelete(ctx, conn, s.svc.scope) + func(ctx context.Context, tx pg.Tx) error { + return documents.BulkSoftDelete(ctx, tx, s.svc.scope) }, ) } @@ -1129,7 +1129,7 @@ func (s *DocumentService) BulkArchive( return s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { controlDocument := coredata.ControlDocument{} if err := controlDocument.DeleteByDocumentIDs(ctx, tx, s.svc.scope, documentIDs); err != nil { return fmt.Errorf("cannot delete control mappings: %w", err) @@ -1157,7 +1157,7 @@ func (s *DocumentService) BulkUnarchive( return s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return documents.BulkUnarchive(ctx, conn, s.svc.scope) }, ) @@ -1179,7 +1179,7 @@ func (s *DocumentService) RequestExport( } } - err := s.svc.pg.WithTx(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, conn pg.Tx) error { var organizationID gid.GID for _, documentID := range documentIDs { document := &coredata.Document{} @@ -1238,7 +1238,7 @@ func (s *DocumentService) CountVersionsForDocumentID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { documentVersions := &coredata.DocumentVersions{} count, err = documentVersions.CountByDocumentID(ctx, conn, s.svc.scope, documentID, filter) @@ -1262,7 +1262,7 @@ func (s *DocumentService) CountSignaturesForVersionID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { documentVersionSignatures := &coredata.DocumentVersionSignatures{} count, err = documentVersionSignatures.CountByDocumentVersionID(ctx, conn, s.svc.scope, documentVersionID, filter) @@ -1287,7 +1287,7 @@ func (s *DocumentService) ListVersions( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := documentVersions.LoadByDocumentID(ctx, conn, s.svc.scope, documentID, cursor, filter) if err != nil { @@ -1313,7 +1313,7 @@ func (s *DocumentService) GetVersion( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return documentVersion.LoadByID(ctx, conn, s.svc.scope, documentVersionID) }, ) @@ -1335,7 +1335,7 @@ func (s *DocumentService) IsSigned( var signed bool err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var err error signed, err = document.IsLastSignableVersionSignedByUserEmail( ctx, @@ -1365,7 +1365,7 @@ func (s *DocumentService) GetViewerApprovalState( var state coredata.DocumentVersionApprovalDecisionState err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var err error state, err = document.GetViewerApprovalStateForLastVersion( ctx, @@ -1394,7 +1394,7 @@ func (s *DocumentService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { documents := &coredata.Documents{} count, err = documents.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) if err != nil { @@ -1422,7 +1422,7 @@ func (s *DocumentService) ListByOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return documents.LoadByOrganizationID( ctx, conn, @@ -1450,7 +1450,7 @@ func (s *DocumentService) CountForControlID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { documents := &coredata.Documents{} count, err = documents.CountByControlID(ctx, conn, s.svc.scope, controlID, filter) if err != nil { @@ -1478,7 +1478,7 @@ func (s *DocumentService) ListForControlID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return documents.LoadByControlID(ctx, conn, s.svc.scope, controlID, cursor, filter) }, ) @@ -1499,7 +1499,7 @@ func (s *DocumentService) CountForRiskID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { documents := &coredata.Documents{} count, err = documents.CountByRiskID(ctx, conn, s.svc.scope, riskID, filter) if err != nil { @@ -1527,7 +1527,7 @@ func (s *DocumentService) ListForRiskID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return documents.LoadByRiskID(ctx, conn, s.svc.scope, riskID, cursor, filter) }, ) @@ -1552,7 +1552,7 @@ func (s *DocumentService) Update( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := document.LoadByID(ctx, tx, s.svc.scope, req.DocumentID); err != nil { return fmt.Errorf("cannot load document %q: %w", req.DocumentID, err) } @@ -1606,7 +1606,7 @@ func (s *DocumentService) Archive( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := document.LoadByID(ctx, tx, s.svc.scope, documentID); err != nil { return fmt.Errorf("cannot load document %q: %w", documentID, err) } @@ -1654,7 +1654,7 @@ func (s *DocumentService) Unarchive( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := document.LoadByID(ctx, tx, s.svc.scope, documentID); err != nil { return fmt.Errorf("cannot load document %q: %w", documentID, err) } @@ -1690,7 +1690,7 @@ func (s *DocumentService) CancelSignatureRequest( return s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := documentVersionSignature.LoadByID(ctx, tx, s.svc.scope, documentVersionSignatureID); err != nil { return fmt.Errorf("cannot load document version signature: %w", err) } @@ -1726,7 +1726,7 @@ func (s *DocumentService) ExportPDF( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Tx) (err error) { data, err = exportDocumentPDF(ctx, s.svc, s.html2pdfConverter, conn, s.svc.scope, documentVersionID, options) if err != nil { return fmt.Errorf("cannot export document PDF: %w", err) @@ -1747,7 +1747,7 @@ func (s *DocumentService) BuildAndUploadExport(ctx context.Context, exportJobID exportJob := &coredata.ExportJob{} err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := exportJob.LoadByID(ctx, tx, s.svc.scope, exportJobID); err != nil { return fmt.Errorf("cannot load export job: %w", err) } @@ -1863,7 +1863,7 @@ func exportDocumentPDF( ctx context.Context, svc *TenantService, html2pdfConverter *html2pdf.Converter, - conn pg.Conn, + conn pg.Querier, scope coredata.Scoper, documentVersionID gid.GID, options ExportPDFOptions, @@ -2043,7 +2043,7 @@ func (s *DocumentService) Export( return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { for i, documentID := range documentIDs { document := &coredata.Document{} if err := document.LoadByID(ctx, conn, s.svc.scope, documentID); err != nil { @@ -2093,7 +2093,7 @@ func (s *DocumentService) SendExportEmail( ) error { return s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { file := &coredata.File{} if err := file.LoadByID(ctx, tx, s.svc.scope, fileID); err != nil { return fmt.Errorf("cannot load file: %w", err) @@ -2188,7 +2188,7 @@ func sanitizeFilename(title string) string { func (s *DocumentService) loadDraftForPublish( ctx context.Context, - tx pg.Conn, + tx pg.Tx, documentID gid.GID, ignoreExisting bool, ) (*coredata.Document, *coredata.DocumentVersion, error) { @@ -2220,7 +2220,7 @@ func (s *DocumentService) loadDraftForPublish( func (s *DocumentService) finalizePublish( ctx context.Context, - tx pg.Conn, + tx pg.Tx, document *coredata.Document, documentVersion *coredata.DocumentVersion, changelog *string, @@ -2249,7 +2249,7 @@ func (s *DocumentService) finalizePublish( func (s *DocumentService) publishMajorVersionInTx( ctx context.Context, - tx pg.Conn, + tx pg.Tx, documentID gid.GID, changelog *string, ignoreExisting bool, @@ -2292,7 +2292,7 @@ func (s *DocumentService) publishMajorVersionInTx( func (s *DocumentService) publishMinorVersionInTx( ctx context.Context, - tx pg.Conn, + tx pg.Tx, documentID gid.GID, changelog *string, ignoreExisting bool, diff --git a/pkg/probo/evidence_description_worker.go b/pkg/probo/evidence_description_worker.go index a1f2ad031..2e9f4bc12 100644 --- a/pkg/probo/evidence_description_worker.go +++ b/pkg/probo/evidence_description_worker.go @@ -126,7 +126,7 @@ func (w *EvidenceDescriptionWorker) processNext(ctx context.Context, sem chan st if err := w.pg.WithTx( nonCancelableCtx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := evidence.LoadNextPendingDescriptionForUpdateSkipLocked( nonCancelableCtx, tx, @@ -183,7 +183,7 @@ func (w *EvidenceDescriptionWorker) describeAndCommit( var file coredata.File if err := w.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := file.LoadByID(ctx, conn, scope, *evidence.EvidenceFileId); err != nil { return fmt.Errorf("cannot load file: %w", err) } @@ -205,7 +205,7 @@ func (w *EvidenceDescriptionWorker) describeAndCommit( return w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { evidence.Description = description evidence.DescriptionStatus = coredata.EvidenceDescriptionStatusCompleted evidence.DescriptionProcessingStartedAt = nil @@ -227,7 +227,7 @@ func (w *EvidenceDescriptionWorker) failEvidence( return w.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { evidence.DescriptionStatus = coredata.EvidenceDescriptionStatusFailed evidence.DescriptionProcessingStartedAt = nil evidence.UpdatedAt = time.Now() @@ -243,7 +243,7 @@ func (w *EvidenceDescriptionWorker) failEvidence( func (w *EvidenceDescriptionWorker) recoverStaleRows(ctx context.Context) { if err := w.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := coredata.ResetStaleDescriptionProcessing(ctx, conn, w.staleAfter); err != nil { return fmt.Errorf("cannot reset stale description processing: %w", err) } diff --git a/pkg/probo/evidence_service.go b/pkg/probo/evidence_service.go index 21f460076..224a8b5e2 100644 --- a/pkg/probo/evidence_service.go +++ b/pkg/probo/evidence_service.go @@ -59,7 +59,7 @@ func (s EvidenceService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := evidence.LoadByID(ctx, conn, s.svc.scope, evidenceID); err != nil { return fmt.Errorf("cannot load evidence %w", err) } @@ -104,7 +104,7 @@ func (s EvidenceService) UploadMeasureEvidence( err = s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { measure := &coredata.Measure{} var file *coredata.File var err error @@ -155,7 +155,7 @@ func (s EvidenceService) CountForMeasureID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { evidences := coredata.Evidences{} count, err = evidences.CountByMeasureID(ctx, conn, s.svc.scope, measureID) if err != nil { @@ -182,7 +182,7 @@ func (s EvidenceService) ListForMeasureID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return evidences.LoadByMeasureID( ctx, conn, @@ -208,7 +208,7 @@ func (s EvidenceService) CountForTaskID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { evidences := coredata.Evidences{} count, err = evidences.CountByTaskID(ctx, conn, s.svc.scope, taskID) if err != nil { @@ -235,7 +235,7 @@ func (s EvidenceService) ListForTaskID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return evidences.LoadByTaskID( ctx, conn, @@ -259,10 +259,10 @@ func (s *EvidenceService) Delete( ) error { evidence := &coredata.Evidence{ID: evidenceID} - return s.svc.pg.WithConn( + return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - err := evidence.Delete(ctx, conn, s.svc.scope) + func(ctx context.Context, tx pg.Tx) error { + err := evidence.Delete(ctx, tx, s.svc.scope) if err != nil { return fmt.Errorf("cannot delete evidence: %w", err) } diff --git a/pkg/probo/file_service.go b/pkg/probo/file_service.go index 1e22adb3d..0b1b95f9d 100644 --- a/pkg/probo/file_service.go +++ b/pkg/probo/file_service.go @@ -57,7 +57,7 @@ func (s FileService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := file.LoadByID(ctx, conn, s.svc.scope, fileID); err != nil { return fmt.Errorf("cannot load file %w", err) } @@ -81,7 +81,7 @@ func (s FileService) GetByIDs( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := files.LoadByIDs( ctx, conn, @@ -161,7 +161,7 @@ func (s FileService) UploadAndSaveFile( err = s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { file = &coredata.File{ ID: fileID, OrganizationID: organizationID, diff --git a/pkg/probo/finding_service.go b/pkg/probo/finding_service.go index d9b001427..f08a70b3d 100644 --- a/pkg/probo/finding_service.go +++ b/pkg/probo/finding_service.go @@ -110,7 +110,7 @@ func (s FindingService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return finding.LoadByID(ctx, conn, s.svc.scope, findingID) }, ) @@ -161,7 +161,7 @@ func (s *FindingService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -201,7 +201,7 @@ func (s *FindingService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := finding.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load finding: %w", err) } @@ -270,10 +270,10 @@ func (s FindingService) Delete( findingID gid.GID, ) error { finding := coredata.Finding{ID: findingID} - return s.svc.pg.WithConn( + return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - err := finding.Delete(ctx, conn, s.svc.scope) + func(ctx context.Context, tx pg.Tx) error { + err := finding.Delete(ctx, tx, s.svc.scope) if err != nil { return fmt.Errorf("cannot delete finding: %w", err) } @@ -292,7 +292,7 @@ func (s FindingService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := findings.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor, filter) if err != nil { return fmt.Errorf("cannot load findings: %w", err) @@ -318,7 +318,7 @@ func (s FindingService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { findings := coredata.Findings{} count, err = findings.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) if err != nil { @@ -347,7 +347,7 @@ func (s FindingService) CreateAuditMapping( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := finding.LoadByID(ctx, conn, s.svc.scope, findingID); err != nil { return fmt.Errorf("cannot load finding: %w", err) } @@ -391,19 +391,19 @@ func (s FindingService) DeleteAuditMapping( finding := &coredata.Finding{} audit := &coredata.Audit{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := finding.LoadByID(ctx, conn, s.svc.scope, findingID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := finding.LoadByID(ctx, tx, s.svc.scope, findingID); err != nil { return fmt.Errorf("cannot load finding: %w", err) } - if err := audit.LoadByID(ctx, conn, s.svc.scope, auditID); err != nil { + if err := audit.LoadByID(ctx, tx, s.svc.scope, auditID); err != nil { return fmt.Errorf("cannot load audit: %w", err) } findingAudit := &coredata.FindingAudit{} - if err := findingAudit.Delete(ctx, conn, s.svc.scope, finding.ID, audit.ID); err != nil { + if err := findingAudit.Delete(ctx, tx, s.svc.scope, finding.ID, audit.ID); err != nil { return fmt.Errorf("cannot delete finding audit mapping: %w", err) } @@ -429,7 +429,7 @@ func (s FindingService) ListForAuditID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := audit.LoadByID(ctx, conn, s.svc.scope, auditID); err != nil { return fmt.Errorf("cannot load audit: %w", err) } @@ -457,7 +457,7 @@ func (s FindingService) CountForAuditID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { findings := coredata.Findings{} count, err = findings.CountByAuditID(ctx, conn, s.svc.scope, auditID, filter) if err != nil { diff --git a/pkg/probo/framework_service.go b/pkg/probo/framework_service.go index 45a1ac174..49cabd97e 100644 --- a/pkg/probo/framework_service.go +++ b/pkg/probo/framework_service.go @@ -108,7 +108,7 @@ func (s FrameworkService) RequestExport( var exportJobID gid.GID exportJob := &coredata.ExportJob{} - err := s.svc.pg.WithTx(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, conn pg.Tx) error { framework := &coredata.Framework{} if err := framework.LoadByID(ctx, conn, s.svc.scope, frameworkID); err != nil { return fmt.Errorf("cannot load framework: %w", err) @@ -160,7 +160,7 @@ func (s FrameworkService) Export( return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { framework := &coredata.Framework{} if err := framework.LoadByID(ctx, conn, s.svc.scope, frameworkID); err != nil { return fmt.Errorf("cannot load framework: %w", err) @@ -353,7 +353,7 @@ func (s FrameworkService) Create( UpdatedAt: now, } - err := s.svc.pg.WithTx(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, conn pg.Tx) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -380,7 +380,7 @@ func (s FrameworkService) CountForOrganizationID( ) (int, error) { var count int - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) (err error) { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) (err error) { frameworks := &coredata.Frameworks{} count, err = frameworks.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID) if err != nil { @@ -404,7 +404,7 @@ func (s FrameworkService) ListForOrganizationID( var frameworks coredata.Frameworks organization := &coredata.Organization{} - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -436,7 +436,7 @@ func (s FrameworkService) Get( ) (*coredata.Framework, error) { framework := &coredata.Framework{} - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { return framework.LoadByID(ctx, conn, s.svc.scope, frameworkID) }) @@ -455,7 +455,7 @@ func (s FrameworkService) GetByIDs( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := frameworks.LoadByIDs( ctx, conn, @@ -485,7 +485,7 @@ func (s FrameworkService) Update( framework := &coredata.Framework{ID: req.ID} - err := s.svc.pg.WithTx(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, conn pg.Tx) error { if err := framework.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load framework: %w", err) } @@ -513,8 +513,8 @@ func (s FrameworkService) Delete( ) error { framework := &coredata.Framework{} - return s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { - return framework.Delete(ctx, conn, s.svc.scope, frameworkID) + return s.svc.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { + return framework.Delete(ctx, tx, s.svc.scope, frameworkID) }) } @@ -527,7 +527,7 @@ func (s FrameworkService) Import( frameworkID := gid.New(organizationID.TenantID(), coredata.FrameworkEntityType) now := time.Now() - err := s.svc.pg.WithTx(ctx, func(tx pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, tx, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -649,7 +649,7 @@ func (s FrameworkService) SendExportEmail( ) error { return s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { file := &coredata.File{} if err := file.LoadByID(ctx, tx, s.svc.scope, fileID); err != nil { return fmt.Errorf("cannot load file: %w", err) @@ -719,7 +719,7 @@ func (s *FrameworkService) BuildAndUploadExport(ctx context.Context, exportJobID exportJob := &coredata.ExportJob{} err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := exportJob.LoadByID(ctx, tx, s.svc.scope, exportJobID); err != nil { return fmt.Errorf("cannot load export job: %w", err) } @@ -823,7 +823,7 @@ func (s FrameworkService) GenerateLightLogoURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { framework := &coredata.Framework{} if err := framework.LoadByID(ctx, conn, s.svc.scope, frameworkID); err != nil { return fmt.Errorf("cannot load framework: %w", err) @@ -865,7 +865,7 @@ func (s FrameworkService) GenerateDarkLogoURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { framework := &coredata.Framework{} if err := framework.LoadByID(ctx, conn, s.svc.scope, frameworkID); err != nil { return fmt.Errorf("cannot load framework: %w", err) diff --git a/pkg/probo/measure_service.go b/pkg/probo/measure_service.go index 2b4467635..de610c567 100644 --- a/pkg/probo/measure_service.go +++ b/pkg/probo/measure_service.go @@ -102,7 +102,7 @@ func (s MeasureService) CountForRiskID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { measures := &coredata.Measures{} count, err = measures.CountByRiskID(ctx, conn, s.svc.scope, riskID, filter) if err != nil { @@ -130,7 +130,7 @@ func (s MeasureService) ListForRiskID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := risk.LoadByID(ctx, conn, s.svc.scope, riskID); err != nil { return fmt.Errorf("cannot load risk: %w", err) } @@ -160,7 +160,7 @@ func (s MeasureService) CountForControlID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { measures := &coredata.Measures{} count, err = measures.CountByControlID(ctx, conn, s.svc.scope, controlID, filter) if err != nil { @@ -189,7 +189,7 @@ func (s MeasureService) ListForControlID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } @@ -219,7 +219,7 @@ func (s MeasureService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { measures := &coredata.Measures{} count, err = measures.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) if err != nil { @@ -245,7 +245,7 @@ func (s MeasureService) ListDistinctCategoriesForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -285,7 +285,7 @@ func (s MeasureService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -321,7 +321,7 @@ func (s MeasureService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return measure.LoadByID(ctx, conn, s.svc.scope, measureID) }, ) @@ -341,7 +341,7 @@ func (s MeasureService) GetByIDs( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := measures.LoadByIDs( ctx, conn, @@ -371,7 +371,7 @@ func (s MeasureService) Import( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := organization.LoadByID(ctx, tx, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -499,7 +499,7 @@ func (s MeasureService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := measure.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load measure: %w", err) } @@ -555,7 +555,7 @@ func (s MeasureService) Create( err = s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -591,7 +591,7 @@ func (s MeasureService) Delete( ctx context.Context, measureID gid.GID, ) error { - return s.svc.pg.WithTx(ctx, func(conn pg.Conn) error { + return s.svc.pg.WithTx(ctx, func(ctx context.Context, conn pg.Tx) error { measure := &coredata.Measure{} if err := measure.Delete(ctx, conn, s.svc.scope, measureID); err != nil { diff --git a/pkg/probo/meeting_service.go b/pkg/probo/meeting_service.go index 65537adbd..af83cc4a0 100644 --- a/pkg/probo/meeting_service.go +++ b/pkg/probo/meeting_service.go @@ -92,7 +92,7 @@ func (s MeetingService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -127,7 +127,7 @@ func (s MeetingService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { meetings := &coredata.Meetings{} count, err = meetings.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID) if err != nil { @@ -153,7 +153,7 @@ func (s MeetingService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return meeting.LoadByID(ctx, conn, s.svc.scope, meetingID) }, ) @@ -179,7 +179,7 @@ func (s MeetingService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -233,7 +233,7 @@ func (s MeetingService) GetAttendees( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return attendees.LoadByMeetingID(ctx, conn, s.svc.scope, meetingID) }, ) @@ -257,7 +257,7 @@ func (s MeetingService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := meeting.LoadByID(ctx, conn, s.svc.scope, req.MeetingID); err != nil { return fmt.Errorf("cannot load meeting: %w", err) } @@ -313,7 +313,7 @@ func (s MeetingService) Delete( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := meeting.LoadByID(ctx, conn, s.svc.scope, meetingID); err != nil { return fmt.Errorf("cannot load meeting: %w", err) } diff --git a/pkg/probo/obligation_service.go b/pkg/probo/obligation_service.go index ee6d69ebf..c5f877143 100644 --- a/pkg/probo/obligation_service.go +++ b/pkg/probo/obligation_service.go @@ -102,7 +102,7 @@ func (s ObligationService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := obligation.LoadByID(ctx, conn, s.svc.scope, obligationID); err != nil { return fmt.Errorf("cannot load obligation: %w", err) } @@ -147,7 +147,7 @@ func (s *ObligationService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -189,7 +189,7 @@ func (s *ObligationService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := obligation.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load obligation: %w", err) } @@ -265,7 +265,7 @@ func (s *ObligationService) Delete( ) error { err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { obligation := &coredata.Obligation{} if err := obligation.LoadByID(ctx, conn, s.svc.scope, obligationID); err != nil { return fmt.Errorf("cannot load obligation: %w", err) @@ -295,7 +295,7 @@ func (s ObligationService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { obligations := coredata.Obligations{} count, err = obligations.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) if err != nil { @@ -324,7 +324,7 @@ func (s ObligationService) ListForControlID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } @@ -355,7 +355,7 @@ func (s ObligationService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := obligations.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor, filter) if err != nil { return fmt.Errorf("cannot load obligations: %w", err) @@ -381,7 +381,7 @@ func (s ObligationService) CountForRiskID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { obligations := &coredata.Obligations{} count, err = obligations.CountByRiskID(ctx, conn, s.svc.scope, riskID, filter) if err != nil { @@ -409,7 +409,7 @@ func (s ObligationService) ListForRiskID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := obligations.LoadByRiskID(ctx, conn, s.svc.scope, riskID, cursor, filter) if err != nil { return fmt.Errorf("cannot load obligations: %w", err) diff --git a/pkg/probo/organization_service.go b/pkg/probo/organization_service.go index 3a7113b35..9d326e402 100644 --- a/pkg/probo/organization_service.go +++ b/pkg/probo/organization_service.go @@ -93,7 +93,7 @@ func (s OrganizationService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return organization.LoadByID( ctx, conn, @@ -118,7 +118,7 @@ func (s OrganizationService) GetByIDs( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := organizations.LoadByIDs( ctx, conn, @@ -146,7 +146,7 @@ func (s OrganizationService) GetContext( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := organizationContext.LoadByOrganizationID( ctx, conn, @@ -181,7 +181,7 @@ func (s OrganizationService) UpdateContext( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := organization.LoadByID(ctx, tx, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -239,7 +239,7 @@ func (s OrganizationService) Update( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := organization.LoadByID(ctx, tx, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -422,7 +422,7 @@ func (s OrganizationService) GenerateLogoURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -464,7 +464,7 @@ func (s OrganizationService) GenerateHorizontalLogoURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -505,7 +505,7 @@ func (s OrganizationService) DeleteHorizontalLogo( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := organization.LoadByID(ctx, tx, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } diff --git a/pkg/probo/processing_activity_service.go b/pkg/probo/processing_activity_service.go index 4c3a7c2e2..12c076282 100644 --- a/pkg/probo/processing_activity_service.go +++ b/pkg/probo/processing_activity_service.go @@ -148,7 +148,7 @@ func (s ProcessingActivityService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return processingActivity.LoadByID(ctx, conn, s.svc.scope, processingActivityID) }, ) @@ -195,7 +195,7 @@ func (s *ProcessingActivityService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -231,7 +231,7 @@ func (s *ProcessingActivityService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := processingActivity.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load processing activity: %w", err) } @@ -322,10 +322,10 @@ func (s ProcessingActivityService) Delete( processingActivityID gid.GID, ) error { processingActivity := coredata.ProcessingActivity{ID: processingActivityID} - return s.svc.pg.WithConn( + return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - err := processingActivity.Delete(ctx, conn, s.svc.scope) + func(ctx context.Context, tx pg.Tx) error { + err := processingActivity.Delete(ctx, tx, s.svc.scope) if err != nil { return fmt.Errorf("cannot delete processing activity: %w", err) } @@ -344,7 +344,7 @@ func (s ProcessingActivityService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := processingActivities.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor, filter) if err != nil { return fmt.Errorf("cannot load processing activities: %w", err) @@ -370,7 +370,7 @@ func (s ProcessingActivityService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { processingActivities := coredata.ProcessingActivities{} count, err = processingActivities.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) if err != nil { @@ -397,7 +397,7 @@ func (s *ProcessingActivityService) ExportPDF( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { var processingActivities coredata.ProcessingActivities if err := processingActivities.LoadAllByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter); err != nil { return fmt.Errorf("cannot load processing activities: %w", err) diff --git a/pkg/probo/report_service.go b/pkg/probo/report_service.go index 378ac068b..ac07af143 100644 --- a/pkg/probo/report_service.go +++ b/pkg/probo/report_service.go @@ -37,7 +37,7 @@ func (s ReportService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := report.LoadByID(ctx, conn, s.svc.scope, reportID) if err != nil { return fmt.Errorf("cannot load report: %w", err) @@ -62,7 +62,7 @@ func (s ReportService) GetByIDs( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := reports.LoadByIDs( ctx, conn, @@ -86,7 +86,7 @@ func (s ReportService) Delete( ctx context.Context, reportID gid.GID, ) error { - return s.svc.pg.WithTx(ctx, func(conn pg.Conn) error { + return s.svc.pg.WithTx(ctx, func(ctx context.Context, conn pg.Tx) error { report := &coredata.Report{} err := report.LoadByID(ctx, conn, s.svc.scope, reportID) if err != nil { diff --git a/pkg/probo/rights_request_service.go b/pkg/probo/rights_request_service.go index c5db86d3b..d37bdecfe 100644 --- a/pkg/probo/rights_request_service.go +++ b/pkg/probo/rights_request_service.go @@ -90,7 +90,7 @@ func (s RightsRequestService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := request.LoadByID(ctx, conn, s.svc.scope, rightsRequestID); err != nil { return fmt.Errorf("cannot load rights request: %w", err) } @@ -132,7 +132,7 @@ func (s *RightsRequestService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -165,7 +165,7 @@ func (s *RightsRequestService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := request.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load rights request: %w", err) } @@ -221,7 +221,7 @@ func (s *RightsRequestService) Delete( ) error { err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { request := &coredata.RightsRequest{} if err := request.LoadByID(ctx, conn, s.svc.scope, rightsRequestID); err != nil { return fmt.Errorf("cannot load rights request: %w", err) @@ -246,7 +246,7 @@ func (s RightsRequestService) CountByOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { requests := coredata.RightsRequests{} count, err = requests.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID) if err != nil { @@ -273,7 +273,7 @@ func (s RightsRequestService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := requests.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor) if err != nil { return fmt.Errorf("cannot load rights requests: %w", err) diff --git a/pkg/probo/risk_service.go b/pkg/probo/risk_service.go index a7b6cb57c..83b004122 100644 --- a/pkg/probo/risk_service.go +++ b/pkg/probo/risk_service.go @@ -105,7 +105,7 @@ func (s RiskService) CountForMeasureID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { risks := &coredata.Risks{} count, err = risks.CountByMeasureID(ctx, conn, s.svc.scope, measureID, filter) if err != nil { @@ -133,7 +133,7 @@ func (s RiskService) ListForMeasureID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return risks.LoadByMeasureID(ctx, conn, s.svc.scope, measureID, cursor, filter) }, ) @@ -154,7 +154,7 @@ func (s RiskService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { risks := &coredata.Risks{} count, err = risks.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) if err != nil { @@ -182,7 +182,7 @@ func (s RiskService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return risks.LoadByOrganizationID( ctx, conn, @@ -209,14 +209,14 @@ func (s RiskService) CreateDocumentMapping( risk := &coredata.Risk{} document := &coredata.Document{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := risk.LoadByID(ctx, conn, s.svc.scope, riskID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := risk.LoadByID(ctx, tx, s.svc.scope, riskID); err != nil { return fmt.Errorf("cannot load risk: %w", err) } - if err := document.LoadByID(ctx, conn, s.svc.scope, documentID); err != nil { + if err := document.LoadByID(ctx, tx, s.svc.scope, documentID); err != nil { return fmt.Errorf("cannot load document: %w", err) } @@ -227,7 +227,7 @@ func (s RiskService) CreateDocumentMapping( CreatedAt: time.Now(), } - return riskDocument.Insert(ctx, conn, s.svc.scope) + return riskDocument.Insert(ctx, tx, s.svc.scope) }, ) @@ -247,18 +247,18 @@ func (s RiskService) DeleteDocumentMapping( risk := &coredata.Risk{} document := &coredata.Document{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := risk.LoadByID(ctx, conn, s.svc.scope, riskID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := risk.LoadByID(ctx, tx, s.svc.scope, riskID); err != nil { return fmt.Errorf("cannot load risk: %w", err) } - if err := document.LoadByID(ctx, conn, s.svc.scope, documentID); err != nil { + if err := document.LoadByID(ctx, tx, s.svc.scope, documentID); err != nil { return fmt.Errorf("cannot load document: %w", err) } - return riskDocument.Delete(ctx, conn, s.svc.scope, risk.ID, document.ID) + return riskDocument.Delete(ctx, tx, s.svc.scope, risk.ID, document.ID) }, ) @@ -277,14 +277,14 @@ func (s RiskService) CreateMeasureMapping( measure := &coredata.Measure{} risk := &coredata.Risk{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := risk.LoadByID(ctx, conn, s.svc.scope, riskID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := risk.LoadByID(ctx, tx, s.svc.scope, riskID); err != nil { return fmt.Errorf("cannot load risk: %w", err) } - if err := measure.LoadByID(ctx, conn, s.svc.scope, measureID); err != nil { + if err := measure.LoadByID(ctx, tx, s.svc.scope, measureID); err != nil { return fmt.Errorf("cannot load measure: %w", err) } @@ -295,7 +295,7 @@ func (s RiskService) CreateMeasureMapping( CreatedAt: time.Now(), } - return riskMeasure.Insert(ctx, conn, s.svc.scope) + return riskMeasure.Insert(ctx, tx, s.svc.scope) }, ) @@ -314,14 +314,14 @@ func (s RiskService) DeleteMeasureMapping( risk := &coredata.Risk{} measure := &coredata.Measure{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := risk.LoadByID(ctx, conn, s.svc.scope, riskID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := risk.LoadByID(ctx, tx, s.svc.scope, riskID); err != nil { return fmt.Errorf("cannot load risk: %w", err) } - if err := measure.LoadByID(ctx, conn, s.svc.scope, measureID); err != nil { + if err := measure.LoadByID(ctx, tx, s.svc.scope, measureID); err != nil { return fmt.Errorf("cannot load measure: %w", err) } @@ -332,7 +332,7 @@ func (s RiskService) DeleteMeasureMapping( CreatedAt: time.Now(), } - return riskMeasure.Delete(ctx, conn, s.svc.scope, risk.ID, measure.ID) + return riskMeasure.Delete(ctx, tx, s.svc.scope, risk.ID, measure.ID) }, ) @@ -351,14 +351,14 @@ func (s RiskService) CreateObligationMapping( risk := &coredata.Risk{} obligation := &coredata.Obligation{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := risk.LoadByID(ctx, conn, s.svc.scope, riskID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := risk.LoadByID(ctx, tx, s.svc.scope, riskID); err != nil { return fmt.Errorf("cannot load risk: %w", err) } - if err := obligation.LoadByID(ctx, conn, s.svc.scope, obligationID); err != nil { + if err := obligation.LoadByID(ctx, tx, s.svc.scope, obligationID); err != nil { return fmt.Errorf("cannot load obligation: %w", err) } @@ -369,7 +369,7 @@ func (s RiskService) CreateObligationMapping( CreatedAt: time.Now(), } - return riskObligation.Insert(ctx, conn, s.svc.scope) + return riskObligation.Insert(ctx, tx, s.svc.scope) }, ) @@ -389,21 +389,21 @@ func (s RiskService) DeleteObligationMapping( risk := &coredata.Risk{} obligation := &coredata.Obligation{} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := risk.LoadByID(ctx, conn, s.svc.scope, riskID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := risk.LoadByID(ctx, tx, s.svc.scope, riskID); err != nil { return fmt.Errorf("cannot load risk: %w", err) } - if err := obligation.LoadByID(ctx, conn, s.svc.scope, obligationID); err != nil { + if err := obligation.LoadByID(ctx, tx, s.svc.scope, obligationID); err != nil { return fmt.Errorf("cannot load obligation: %w", err) } riskObligation.RiskID = risk.ID riskObligation.ObligationID = obligation.ID - return riskObligation.Delete(ctx, conn, s.svc.scope) + return riskObligation.Delete(ctx, tx, s.svc.scope) }, ) @@ -454,20 +454,20 @@ func (s RiskService) Create( risk.ResidualImpact = *req.ResidualImpact } - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := organization.LoadByID(ctx, tx, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } if req.OwnerID != nil { - if err := owner.LoadByID(ctx, conn, s.svc.scope, *req.OwnerID); err != nil { + if err := owner.LoadByID(ctx, tx, s.svc.scope, *req.OwnerID); err != nil { return fmt.Errorf("cannot load owner profile: %w", err) } } - return risk.Insert(ctx, conn, s.svc.scope) + return risk.Insert(ctx, tx, s.svc.scope) }, ) @@ -486,7 +486,7 @@ func (s RiskService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return risk.LoadByID(ctx, conn, s.svc.scope, riskID) }, ) @@ -506,7 +506,7 @@ func (s RiskService) GetByIDs( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := risks.LoadByIDs( ctx, conn, @@ -538,7 +538,7 @@ func (s RiskService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := risk.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load risk: %w", err) } @@ -613,10 +613,10 @@ func (s RiskService) Delete( ) error { risk := &coredata.Risk{} - return s.svc.pg.WithConn( + return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - return risk.Delete(ctx, conn, s.svc.scope, riskID) + func(ctx context.Context, tx pg.Tx) error { + return risk.Delete(ctx, tx, s.svc.scope, riskID) }, ) } diff --git a/pkg/probo/service.go b/pkg/probo/service.go index 93bd5ed8b..2286f958b 100644 --- a/pkg/probo/service.go +++ b/pkg/probo/service.go @@ -360,7 +360,7 @@ func (s *Service) lockExportJob(ctx context.Context) (*coredata.ExportJob, error err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { if err := exportJob.LoadNextPendingForUpdateSkipLocked(ctx, tx); err != nil { return fmt.Errorf("cannot load next pending export job: %w", err) } @@ -389,11 +389,11 @@ func (s *Service) commitFailedExport(ctx context.Context, exportJob *coredata.Ex errorMsg := failureErr.Error() exportJob.Error = &errorMsg - return s.pg.WithConn( + return s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { scope := coredata.NewScope(exportJob.ID.TenantID()) - if err := exportJob.Update(ctx, conn, scope); err != nil { + if err := exportJob.Update(ctx, tx, scope); err != nil { return fmt.Errorf("cannot update %s export job: %w", exportJob.Type, err) } @@ -406,11 +406,11 @@ func (s *Service) commitSuccessfulExport(ctx context.Context, exportJob *coredat exportJob.CompletedAt = new(time.Now()) exportJob.Status = coredata.ExportJobStatusCompleted - return s.pg.WithConn( + return s.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { scope := coredata.NewScope(exportJob.ID.TenantID()) - if err := exportJob.Update(ctx, conn, scope); err != nil { + if err := exportJob.Update(ctx, tx, scope); err != nil { return fmt.Errorf("cannot update %s export job: %w", exportJob.Type, err) } @@ -424,7 +424,7 @@ func (s *Service) LoadOrganizationByDomain(ctx context.Context, domain string) ( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var customDomain coredata.CustomDomain if err := customDomain.LoadByDomain(ctx, conn, coredata.NewNoScope(), domain); err != nil { return fmt.Errorf("cannot load custom domain: %w", err) diff --git a/pkg/probo/snapshot_service.go b/pkg/probo/snapshot_service.go index d8f330229..ab7dd9906 100644 --- a/pkg/probo/snapshot_service.go +++ b/pkg/probo/snapshot_service.go @@ -56,7 +56,7 @@ func (s *SnapshotService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return snapshot.LoadByID(ctx, conn, s.svc.scope, snapshotID) }, ) @@ -85,7 +85,7 @@ func (s *SnapshotService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -119,15 +119,15 @@ func (s *SnapshotService) Delete( ctx context.Context, snapshotID gid.GID, ) error { - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { snapshot := &coredata.Snapshot{} - if err := snapshot.LoadByID(ctx, conn, s.svc.scope, snapshotID); err != nil { + if err := snapshot.LoadByID(ctx, tx, s.svc.scope, snapshotID); err != nil { return fmt.Errorf("cannot load snapshot: %w", err) } - if err := snapshot.Delete(ctx, conn, s.svc.scope); err != nil { + if err := snapshot.Delete(ctx, tx, s.svc.scope); err != nil { return fmt.Errorf("cannot delete snapshot: %w", err) } @@ -147,7 +147,7 @@ func (s *SnapshotService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := snapshots.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor); err != nil { return fmt.Errorf("cannot load snapshots: %w", err) } @@ -170,7 +170,7 @@ func (s *SnapshotService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { snapshots := coredata.Snapshots{} filter := coredata.NewSnapshotFilter(nil) count, err = snapshots.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) @@ -199,7 +199,7 @@ func (s *SnapshotService) ListForControlID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := control.LoadByID(ctx, conn, s.svc.scope, controlID); err != nil { return fmt.Errorf("cannot load control: %w", err) } diff --git a/pkg/probo/state_of_applicability_service.go b/pkg/probo/state_of_applicability_service.go index 23cdd021a..aba620100 100644 --- a/pkg/probo/state_of_applicability_service.go +++ b/pkg/probo/state_of_applicability_service.go @@ -79,7 +79,7 @@ func (s StateOfApplicabilityService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -116,7 +116,7 @@ func (s StateOfApplicabilityService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { statesOfApplicability := &coredata.StatesOfApplicability{} count, err = statesOfApplicability.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) if err != nil { @@ -142,7 +142,7 @@ func (s StateOfApplicabilityService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return stateOfApplicability.LoadByID(ctx, conn, s.svc.scope, stateOfApplicabilityID) }, ) @@ -167,7 +167,7 @@ func (s StateOfApplicabilityService) Create( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID) }, ) @@ -187,7 +187,7 @@ func (s StateOfApplicabilityService) Create( err = s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := stateOfApplicability.Insert(ctx, conn, s.svc.scope); err != nil { return fmt.Errorf("cannot insert state_of_applicability: %w", err) } @@ -215,7 +215,7 @@ func (s StateOfApplicabilityService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := stateOfApplicability.LoadByID(ctx, conn, s.svc.scope, req.StateOfApplicabilityID); err != nil { return fmt.Errorf("cannot load state_of_applicability: %w", err) } @@ -252,7 +252,7 @@ func (s StateOfApplicabilityService) Delete( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := stateOfApplicability.LoadByID(ctx, conn, s.svc.scope, stateOfApplicabilityID); err != nil { return fmt.Errorf("cannot load state_of_applicability: %w", err) } @@ -280,7 +280,7 @@ func (s StateOfApplicabilityService) GetApplicabilityStatement( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return applicabilityStatement.LoadByID(ctx, conn, s.svc.scope, applicabilityStatementID) }, ) @@ -300,7 +300,7 @@ func (s StateOfApplicabilityService) ListApplicabilityStatements( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := statements.LoadByStateOfApplicabilityID(ctx, conn, s.svc.scope, stateOfApplicabilityID, cursor); err != nil { return fmt.Errorf("cannot load applicability statements: %w", err) } @@ -323,7 +323,7 @@ func (s StateOfApplicabilityService) CountApplicabilityStatements( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { statements := &coredata.ApplicabilityStatements{} count, err = statements.CountByStateOfApplicabilityID(ctx, conn, s.svc.scope, stateOfApplicabilityID) if err != nil { @@ -355,7 +355,7 @@ func (s StateOfApplicabilityService) CreateApplicabilityStatement( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := stateOfApplicability.LoadByID(ctx, conn, s.svc.scope, stateOfApplicabilityID); err != nil { return fmt.Errorf("cannot load state of applicability: %w", err) } @@ -395,7 +395,7 @@ func (s StateOfApplicabilityService) UpdateApplicabilityStatement( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := applicabilityStatement.LoadByID(ctx, conn, s.svc.scope, applicabilityStatementID); err != nil { return err } @@ -422,7 +422,7 @@ func (s StateOfApplicabilityService) DeleteApplicabilityStatement( return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { return applicabilityStatement.DeleteByID(ctx, conn, s.svc.scope, applicabilityStatementID) }, ) @@ -435,7 +435,7 @@ func (s StateOfApplicabilityService) ListControlLinks( ) (*page.Page[*coredata.ApplicabilityStatement, coredata.ApplicabilityStatementOrderField], error) { var controls coredata.ApplicabilityStatements - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { return controls.LoadByControlID(ctx, conn, s.svc.scope, controlID, cursor) }) if err != nil { @@ -453,7 +453,7 @@ func (s StateOfApplicabilityService) ExportPDF( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { stateOfApplicability := &coredata.StateOfApplicability{} if err := stateOfApplicability.LoadByID(ctx, conn, s.svc.scope, stateOfApplicabilityID); err != nil { return fmt.Errorf("cannot load state of applicability: %w", err) diff --git a/pkg/probo/task_service.go b/pkg/probo/task_service.go index 8b600e04f..fc6b53b6b 100644 --- a/pkg/probo/task_service.go +++ b/pkg/probo/task_service.go @@ -121,7 +121,7 @@ func (s TaskService) Create( err = s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if req.MeasureID != nil { measure := &coredata.Measure{} if err := measure.LoadByID(ctx, conn, s.svc.scope, *req.MeasureID); err != nil { @@ -158,7 +158,7 @@ func (s TaskService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return task.LoadByID(ctx, conn, s.svc.scope, taskID) }, ) @@ -177,7 +177,7 @@ func (s TaskService) GetByIDs( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := tasks.LoadByIDs( ctx, conn, @@ -206,7 +206,7 @@ func (s TaskService) Assign( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := task.LoadByID(ctx, conn, s.svc.scope, taskID); err != nil { return fmt.Errorf("cannot load task %q: %w", taskID, err) } @@ -241,7 +241,7 @@ func (s TaskService) Unassign( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := task.LoadByID(ctx, conn, s.svc.scope, taskID); err != nil { return fmt.Errorf("cannot load task %q: %w", taskID, err) } @@ -275,7 +275,7 @@ func (s TaskService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := task.LoadByID(ctx, conn, s.svc.scope, req.TaskID); err != nil { return fmt.Errorf("cannot load task %q: %w", req.TaskID, err) } @@ -372,7 +372,7 @@ func (s TaskService) Delete( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { return task.Delete(ctx, conn, s.svc.scope) }, ) @@ -391,7 +391,7 @@ func (s TaskService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { tasks := coredata.Tasks{} count, err = tasks.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID) if err != nil { @@ -417,7 +417,7 @@ func (s TaskService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return tasks.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor) }, ) @@ -436,7 +436,7 @@ func (s TaskService) CountForMeasureID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { tasks := coredata.Tasks{} count, err = tasks.CountByMeasureID(ctx, conn, s.svc.scope, measureID) if err != nil { @@ -462,7 +462,7 @@ func (s TaskService) ListForMeasureID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return tasks.LoadByMeasureID( ctx, conn, diff --git a/pkg/probo/transfer_impact_assessment_service.go b/pkg/probo/transfer_impact_assessment_service.go index e1141a21f..60f79ad5e 100644 --- a/pkg/probo/transfer_impact_assessment_service.go +++ b/pkg/probo/transfer_impact_assessment_service.go @@ -88,7 +88,7 @@ func (s TransferImpactAssessmentService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := tia.LoadByID(ctx, conn, s.svc.scope, tiaID); err != nil { return fmt.Errorf("cannot load transfer impact assessment: %w", err) } @@ -112,7 +112,7 @@ func (s TransferImpactAssessmentService) GetByProcessingActivityID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := tia.LoadByProcessingActivityID(ctx, conn, s.svc.scope, processingActivityID); err != nil { return fmt.Errorf("cannot load transfer impact assessment: %w", err) } @@ -138,7 +138,7 @@ func (s TransferImpactAssessmentService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := tias.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor, filter) if err != nil { return fmt.Errorf("cannot load transfer impact assessments: %w", err) @@ -164,7 +164,7 @@ func (s TransferImpactAssessmentService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { tias := coredata.TransferImpactAssessments{} count, err = tias.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) return err @@ -202,7 +202,7 @@ func (s *TransferImpactAssessmentService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { processingActivity := &coredata.ProcessingActivity{} if err := processingActivity.LoadByID(ctx, conn, s.svc.scope, req.ProcessingActivityID); err != nil { return fmt.Errorf("cannot load processing activity: %w", err) @@ -237,7 +237,7 @@ func (s *TransferImpactAssessmentService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := tia.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load transfer impact assessment: %w", err) } @@ -285,7 +285,7 @@ func (s *TransferImpactAssessmentService) Delete( ) error { err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { tia := &coredata.TransferImpactAssessment{} if err := tia.LoadByID(ctx, conn, s.svc.scope, tiaID); err != nil { return fmt.Errorf("cannot load transfer impact assessment: %w", err) @@ -311,7 +311,7 @@ func (s *TransferImpactAssessmentService) ExportPDF( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { var assessments coredata.TransferImpactAssessments if err := assessments.LoadAllByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter); err != nil { return fmt.Errorf("cannot load transfer impact assessments: %w", err) diff --git a/pkg/probo/trust_center_access_service.go b/pkg/probo/trust_center_access_service.go index 93c0ac76c..cbd025d3c 100644 --- a/pkg/probo/trust_center_access_service.go +++ b/pkg/probo/trust_center_access_service.go @@ -84,7 +84,7 @@ func (s TrustCenterAccessService) ListForTrustCenterID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return accesses.LoadByTrustCenterID(ctx, conn, s.svc.scope, trustCenterID, cursor) }, ) @@ -105,7 +105,7 @@ func (s TrustCenterAccessService) ListAvailableDocumentAccesses( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return documentAccesses.LoadAvailableByTrustCenterAccessID(ctx, conn, s.svc.scope, trustCenterAccessID, cursor) }, ) @@ -125,7 +125,7 @@ func (s TrustCenterAccessService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return access.LoadByID(ctx, conn, s.svc.scope, accessID) }, ) @@ -144,7 +144,7 @@ func (s TrustCenterAccessService) CountDocumentAccesses( var count int err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var documentAccesses coredata.TrustCenterDocumentAccesses var err error count, err = documentAccesses.CountByTrustCenterAccessID(ctx, conn, s.svc.scope, trustCenterAccessID) @@ -166,7 +166,7 @@ func (s TrustCenterAccessService) CountPendingRequestDocumentAccesses( var count int err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var documentAccesses coredata.TrustCenterDocumentAccesses var err error count, err = documentAccesses.CountPendingRequestByTrustCenterAccessID(ctx, conn, s.svc.scope, trustCenterAccessID) @@ -188,7 +188,7 @@ func (s TrustCenterAccessService) CountActiveDocumentAccesses( var count int err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var documentAccesses coredata.TrustCenterDocumentAccesses var err error count, err = documentAccesses.CountActiveByTrustCenterAccessID(ctx, conn, s.svc.scope, trustCenterAccessID) @@ -219,7 +219,7 @@ func (s TrustCenterAccessService) Update( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { access = &coredata.TrustCenterAccess{} if err := access.LoadByID(ctx, tx, s.svc.scope, req.ID); err != nil { @@ -306,7 +306,7 @@ func (s TrustCenterAccessService) Delete( ) error { err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { access := &coredata.TrustCenterAccess{} if err := access.LoadByID(ctx, tx, s.svc.scope, trustCenterAccessID); err != nil { @@ -324,7 +324,7 @@ func (s TrustCenterAccessService) Delete( return err } -func (s TrustCenterAccessService) sendAccessEmail(ctx context.Context, tx pg.Conn, access *coredata.TrustCenterAccess) error { +func (s TrustCenterAccessService) sendAccessEmail(ctx context.Context, tx pg.Tx, access *coredata.TrustCenterAccess) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, tx, s.svc.scope, access.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) diff --git a/pkg/probo/trust_center_file_service.go b/pkg/probo/trust_center_file_service.go index 774f76fb9..303358b2f 100644 --- a/pkg/probo/trust_center_file_service.go +++ b/pkg/probo/trust_center_file_service.go @@ -88,7 +88,7 @@ func (s TrustCenterFileService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := files.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor, filter); err != nil { return fmt.Errorf("cannot load trust center files: %w", err) } @@ -111,7 +111,7 @@ func (s TrustCenterFileService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var err error count, err = (&coredata.TrustCenterFiles{}).CountByOrganizationID(ctx, conn, s.svc.scope, organizationID) if err != nil { @@ -134,7 +134,7 @@ func (s TrustCenterFileService) Get( ) (*coredata.TrustCenterFile, error) { var file *coredata.TrustCenterFile - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { file = &coredata.TrustCenterFile{} if err := file.LoadByID(ctx, conn, s.svc.scope, id); err != nil { return fmt.Errorf("cannot load trust center file: %w", err) @@ -179,7 +179,7 @@ func (s TrustCenterFileService) Create( err = s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { fileID, objectKey, err := s.uploadFile(ctx, tx, req.File, trustCenterFileID, req.OrganizationID, now) if err != nil { return fmt.Errorf("cannot upload file: %w", err) @@ -227,7 +227,7 @@ func (s TrustCenterFileService) Update( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { file = &coredata.TrustCenterFile{} if err := file.LoadByID(ctx, tx, s.svc.scope, req.ID); err != nil { @@ -266,7 +266,7 @@ func (s TrustCenterFileService) Delete( ) error { err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { file := &coredata.TrustCenterFile{} if err := file.LoadByID(ctx, tx, s.svc.scope, trustCenterFileID); err != nil { @@ -292,7 +292,7 @@ func (s TrustCenterFileService) GenerateFileURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { file := &coredata.TrustCenterFile{} if err := file.LoadByID(ctx, conn, s.svc.scope, trustCenterFileID); err != nil { return fmt.Errorf("cannot load trust center file: %w", err) @@ -321,7 +321,7 @@ func (s TrustCenterFileService) GenerateFileURL( func (s TrustCenterFileService) uploadFile( ctx context.Context, - tx pg.Conn, + tx pg.Tx, file File, trustCenterFileID gid.GID, organizationID gid.GID, diff --git a/pkg/probo/trust_center_reference_service.go b/pkg/probo/trust_center_reference_service.go index 866cdd9b1..8c23fa202 100644 --- a/pkg/probo/trust_center_reference_service.go +++ b/pkg/probo/trust_center_reference_service.go @@ -85,7 +85,7 @@ func (s TrustCenterReferenceService) ListForTrustCenterID( ) (*page.Page[*coredata.TrustCenterReference, coredata.TrustCenterReferenceOrderField], error) { var references coredata.TrustCenterReferences - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { err := references.LoadByTrustCenterID(ctx, conn, s.svc.scope, trustCenterID, cursor) if err != nil { return fmt.Errorf("cannot load trust center references: %w", err) @@ -107,7 +107,7 @@ func (s TrustCenterReferenceService) CountForTrustCenterID( ) (int, error) { var count int - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) (err error) { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) (err error) { references := coredata.TrustCenterReferences{} count, err = references.CountByTrustCenterID(ctx, conn, s.svc.scope, trustCenterID) if err != nil { @@ -130,7 +130,7 @@ func (s TrustCenterReferenceService) Get( ) (*coredata.TrustCenterReference, error) { var reference coredata.TrustCenterReference - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { err := reference.LoadByID(ctx, conn, s.svc.scope, referenceID) if err != nil { return fmt.Errorf("cannot load trust center reference: %w", err) @@ -162,7 +162,7 @@ func (s TrustCenterReferenceService) Create( var logoKey string - err := s.svc.pg.WithTx(ctx, func(tx pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { trustCenter := &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, tx, s.svc.scope, req.TrustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -215,7 +215,7 @@ func (s TrustCenterReferenceService) Update( var newFileID *gid.GID var logoKey string - err := s.svc.pg.WithTx(ctx, func(tx pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { reference = &coredata.TrustCenterReference{} if err := reference.LoadByID(ctx, tx, s.svc.scope, req.ID); err != nil { @@ -271,7 +271,7 @@ func (s TrustCenterReferenceService) Delete( ctx context.Context, trustCenterReferenceID gid.GID, ) error { - err := s.svc.pg.WithTx(ctx, func(tx pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { reference := &coredata.TrustCenterReference{} if err := reference.LoadByID(ctx, tx, s.svc.scope, trustCenterReferenceID); err != nil { @@ -295,7 +295,7 @@ func (s TrustCenterReferenceService) GenerateLogoURL( ) (string, error) { reference := &coredata.TrustCenterReference{} file := &coredata.File{} - err := s.svc.pg.WithTx(ctx, func(tx pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { err := reference.LoadByID(ctx, tx, s.svc.scope, referenceID) if err != nil { return fmt.Errorf("cannot load trust center reference: %w", err) @@ -336,7 +336,7 @@ func (s TrustCenterReferenceService) GenerateLogoURL( func (s TrustCenterReferenceService) uploadLogoFile( ctx context.Context, - tx pg.Conn, + tx pg.Tx, file File, referenceID gid.GID, trustCenterID gid.GID, diff --git a/pkg/probo/trust_center_service.go b/pkg/probo/trust_center_service.go index 0840011fd..af3332e35 100644 --- a/pkg/probo/trust_center_service.go +++ b/pkg/probo/trust_center_service.go @@ -112,7 +112,7 @@ func (s TrustCenterService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { trustCenter = &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, conn, s.svc.scope, trustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -137,7 +137,7 @@ func (s TrustCenterService) GetByOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { trustCenter = &coredata.TrustCenter{} if err := trustCenter.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -167,7 +167,7 @@ func (s TrustCenterService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { trustCenter = &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -224,7 +224,7 @@ func (s TrustCenterService) UploadNDA( err = s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { trustCenter = &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, conn, s.svc.scope, req.TrustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -301,7 +301,7 @@ func (s TrustCenterService) DeleteNDA( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { trustCenter = &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, conn, s.svc.scope, trustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -338,7 +338,7 @@ func (s TrustCenterService) UpdateTrustCenterBrand( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { trustCenter = &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, conn, s.svc.scope, req.TrustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -396,7 +396,7 @@ func (s TrustCenterService) UpdateTrustCenterBrand( func (s TrustCenterService) uploadFile( ctx context.Context, - conn pg.Conn, + conn pg.Tx, fileUpload *FileUpload, fileType string, trustCenter *coredata.TrustCenter, @@ -468,7 +468,7 @@ func (s TrustCenterService) GenerateNDAFileURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := trustCenter.LoadByID(ctx, conn, s.svc.scope, trustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) } @@ -511,7 +511,7 @@ func (s TrustCenterService) GenerateLogoURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := compliancePage.LoadByID(ctx, conn, s.svc.scope, compliancePageID); err != nil { return fmt.Errorf("cannot load compliance page: %w", err) } @@ -557,7 +557,7 @@ func (s TrustCenterService) GenerateDarkLogoURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := compliancePage.LoadByID(ctx, conn, s.svc.scope, compliancePageID); err != nil { return fmt.Errorf("cannot load compliance page: %w", err) } @@ -606,7 +606,7 @@ func (s *TrustCenterService) EmailPresenterConfig(ctx context.Context, complianc err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := compliancePage.LoadByID(ctx, conn, scope, compliancePageID); err != nil { return fmt.Errorf("cannot load compliance page: %w", err) } @@ -688,7 +688,7 @@ func (s *TrustCenterService) GetMailingList( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { trustCenter := &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, conn, s.svc.scope, trustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) diff --git a/pkg/probo/vendor_business_associate_agreement_service.go b/pkg/probo/vendor_business_associate_agreement_service.go index 278c5b5de..1a5280fb1 100644 --- a/pkg/probo/vendor_business_associate_agreement_service.go +++ b/pkg/probo/vendor_business_associate_agreement_service.go @@ -75,7 +75,7 @@ func (s VendorBusinessAssociateAgreementService) GetByVendorID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { vendorBusinessAssociateAgreement = &coredata.VendorBusinessAssociateAgreement{} if err := vendorBusinessAssociateAgreement.LoadByVendorID(ctx, conn, s.svc.scope, vendorID); err != nil { return fmt.Errorf("cannot load vendor business associate agreement: %w", err) @@ -116,7 +116,7 @@ func (s VendorBusinessAssociateAgreementService) Upload( err = s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { vendor := &coredata.Vendor{} if err := vendor.LoadByID(ctx, conn, s.svc.scope, vendorID); err != nil { return fmt.Errorf("cannot load vendor: %w", err) @@ -203,7 +203,7 @@ func (s VendorBusinessAssociateAgreementService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { vendorBusinessAssociateAgreement = &coredata.VendorBusinessAssociateAgreement{} if err := vendorBusinessAssociateAgreement.LoadByID(ctx, conn, s.svc.scope, vendorBusinessAssociateAgreementID); err != nil { return fmt.Errorf("cannot load vendor business associate agreement: %w", err) @@ -234,7 +234,7 @@ func (s VendorBusinessAssociateAgreementService) GenerateFileURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { vendorBusinessAssociateAgreement := &coredata.VendorBusinessAssociateAgreement{} if err := vendorBusinessAssociateAgreement.LoadByID(ctx, conn, s.svc.scope, vendorBusinessAssociateAgreementID); err != nil { return fmt.Errorf("cannot load vendor business associate agreement: %w", err) @@ -287,7 +287,7 @@ func (s VendorBusinessAssociateAgreementService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := existingAgreement.LoadByVendorID(ctx, conn, s.svc.scope, vendorID); err != nil { return fmt.Errorf("cannot load existing vendor business associate agreement: %w", err) } @@ -327,7 +327,7 @@ func (s VendorBusinessAssociateAgreementService) Delete( ) error { return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { vendorBusinessAssociateAgreement := &coredata.VendorBusinessAssociateAgreement{} if err := vendorBusinessAssociateAgreement.LoadByID(ctx, conn, s.svc.scope, vendorBusinessAssociateAgreementID); err != nil { return fmt.Errorf("cannot load vendor business associate agreement: %w", err) @@ -348,7 +348,7 @@ func (s VendorBusinessAssociateAgreementService) DeleteByVendorID( ) error { return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { vendorBusinessAssociateAgreement := &coredata.VendorBusinessAssociateAgreement{} if err := vendorBusinessAssociateAgreement.LoadByVendorID(ctx, conn, s.svc.scope, vendorID); err != nil { return fmt.Errorf("cannot load vendor business associate agreement: %w", err) diff --git a/pkg/probo/vendor_compliance_report_service.go b/pkg/probo/vendor_compliance_report_service.go index 813e49169..14510d4be 100644 --- a/pkg/probo/vendor_compliance_report_service.go +++ b/pkg/probo/vendor_compliance_report_service.go @@ -58,7 +58,7 @@ func (s VendorComplianceReportService) ListForVendorID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return vendorComplianceReports.LoadForVendorID(ctx, conn, s.svc.scope, vendorID, cursor) }, ) @@ -114,10 +114,10 @@ func (s VendorComplianceReportService) Upload( UpdatedAt: now, } - err = s.svc.pg.WithConn( + err = s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - return vendorComplianceReport.Insert(ctx, conn, s.svc.scope) + func(ctx context.Context, tx pg.Tx) error { + return vendorComplianceReport.Insert(ctx, tx, s.svc.scope) }, ) @@ -136,7 +136,7 @@ func (s VendorComplianceReportService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return vendorComplianceReport.LoadByID(ctx, conn, s.svc.scope, vendorComplianceReportID) }, ) @@ -154,10 +154,10 @@ func (s VendorComplianceReportService) Delete( ) error { vendorComplianceReport := &coredata.VendorComplianceReport{ID: vendorComplianceReportID} - err := s.svc.pg.WithConn( + err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { - if err := vendorComplianceReport.Delete(ctx, conn, s.svc.scope); err != nil { + func(ctx context.Context, tx pg.Tx) error { + if err := vendorComplianceReport.Delete(ctx, tx, s.svc.scope); err != nil { return err } diff --git a/pkg/probo/vendor_contact_service.go b/pkg/probo/vendor_contact_service.go index 6d6b31416..e106e9d08 100644 --- a/pkg/probo/vendor_contact_service.go +++ b/pkg/probo/vendor_contact_service.go @@ -79,7 +79,7 @@ func (s VendorContactService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := vendorContact.LoadByID(ctx, conn, s.svc.scope, vendorContactID) if err != nil { return fmt.Errorf("cannot load vendor contact: %w", err) @@ -105,7 +105,7 @@ func (s VendorContactService) List( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := vendorContacts.LoadByVendorID(ctx, conn, s.svc.scope, vendorID, cursor) if err != nil { return fmt.Errorf("cannot load vendor contacts: %w", err) @@ -144,7 +144,7 @@ func (s VendorContactService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { vendor := &coredata.Vendor{} if err := vendor.LoadByID(ctx, conn, s.svc.scope, req.VendorID); err != nil { return fmt.Errorf("cannot load vendor: %w", err) @@ -179,7 +179,7 @@ func (s VendorContactService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { err := vendorContact.LoadByID(ctx, conn, s.svc.scope, req.ID) if err != nil { return fmt.Errorf("cannot load vendor contact: %w", err) @@ -217,7 +217,7 @@ func (s VendorContactService) Delete( vendorContact := coredata.VendorContact{ID: vendorContactID} return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := vendorContact.LoadByID(ctx, conn, s.svc.scope, vendorContactID); err != nil { return fmt.Errorf("cannot load vendor contact: %w", err) } diff --git a/pkg/probo/vendor_data_privacy_agreement_service.go b/pkg/probo/vendor_data_privacy_agreement_service.go index 5953332c9..64fa866d0 100644 --- a/pkg/probo/vendor_data_privacy_agreement_service.go +++ b/pkg/probo/vendor_data_privacy_agreement_service.go @@ -75,7 +75,7 @@ func (s VendorDataPrivacyAgreementService) GetByVendorID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { vendorDataPrivacyAgreement = &coredata.VendorDataPrivacyAgreement{} if err := vendorDataPrivacyAgreement.LoadByVendorID(ctx, conn, s.svc.scope, vendorID); err != nil { return fmt.Errorf("cannot load vendor data privacy agreement: %w", err) @@ -117,7 +117,7 @@ func (s VendorDataPrivacyAgreementService) Upload( err = s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { vendor = &coredata.Vendor{} if err := vendor.LoadByID(ctx, conn, s.svc.scope, vendorID); err != nil { return fmt.Errorf("cannot load vendor: %w", err) @@ -201,7 +201,7 @@ func (s VendorDataPrivacyAgreementService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { vendorDataPrivacyAgreement = &coredata.VendorDataPrivacyAgreement{} if err := vendorDataPrivacyAgreement.LoadByID(ctx, conn, s.svc.scope, vendorDataPrivacyAgreementID); err != nil { return fmt.Errorf("cannot load vendor data privacy agreement: %w", err) @@ -232,7 +232,7 @@ func (s VendorDataPrivacyAgreementService) GenerateFileURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { vendorDataPrivacyAgreement := &coredata.VendorDataPrivacyAgreement{} if err := vendorDataPrivacyAgreement.LoadByID(ctx, conn, s.svc.scope, vendorDataPrivacyAgreementID); err != nil { return fmt.Errorf("cannot load vendor data privacy agreement: %w", err) @@ -285,7 +285,7 @@ func (s VendorDataPrivacyAgreementService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := existingAgreement.LoadByVendorID(ctx, conn, s.svc.scope, vendorID); err != nil { return fmt.Errorf("cannot load existing vendor data privacy agreement: %w", err) } @@ -325,7 +325,7 @@ func (s VendorDataPrivacyAgreementService) Delete( ) error { return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { vendorDataPrivacyAgreement := &coredata.VendorDataPrivacyAgreement{} if err := vendorDataPrivacyAgreement.LoadByID(ctx, conn, s.svc.scope, vendorDataPrivacyAgreementID); err != nil { return fmt.Errorf("cannot load vendor data privacy agreement: %w", err) @@ -346,7 +346,7 @@ func (s VendorDataPrivacyAgreementService) DeleteByVendorID( ) error { return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { vendorDataPrivacyAgreement := &coredata.VendorDataPrivacyAgreement{} if err := vendorDataPrivacyAgreement.LoadByVendorID(ctx, conn, s.svc.scope, vendorID); err != nil { return fmt.Errorf("cannot load vendor data privacy agreement: %w", err) diff --git a/pkg/probo/vendor_service.go b/pkg/probo/vendor_service.go index 9e7c64d09..b7c9b0c03 100644 --- a/pkg/probo/vendor_service.go +++ b/pkg/probo/vendor_service.go @@ -163,7 +163,7 @@ func (s VendorService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { vendors := coredata.Vendors{} filter := &coredata.VendorFilter{} count, err = vendors.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID, filter) @@ -193,7 +193,7 @@ func (s VendorService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -224,7 +224,7 @@ func (s VendorService) CountForDatumID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { vendors := coredata.Vendors{} count, err = vendors.CountByDatumID(ctx, conn, s.svc.scope, datumID) if err != nil { @@ -251,7 +251,7 @@ func (s VendorService) ListForDatumID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return vendors.LoadByDatumID( ctx, conn, @@ -281,7 +281,7 @@ func (s VendorService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := vendor.LoadByID(ctx, conn, s.svc.scope, req.ID); err != nil { return fmt.Errorf("cannot load vendor %q: %w", req.ID, err) } @@ -417,7 +417,7 @@ func (s VendorService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return vendor.LoadByID(ctx, conn, s.svc.scope, vendorID) }, ) @@ -437,7 +437,7 @@ func (s VendorService) GetByIDs( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := vendors.LoadByIDs( ctx, conn, @@ -465,7 +465,7 @@ func (s VendorService) Delete( return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := vendor.LoadByID(ctx, conn, s.svc.scope, vendorID); err != nil { return fmt.Errorf("cannot load vendor: %w", err) } @@ -513,7 +513,7 @@ func (s VendorService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization %q: %w", req.OrganizationID, err) @@ -570,7 +570,7 @@ func (s VendorService) CountForAssetID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { vendors := coredata.Vendors{} count, err = vendors.CountByAssetID(ctx, conn, s.svc.scope, assetID) if err != nil { @@ -597,7 +597,7 @@ func (s VendorService) ListForAssetID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return vendors.LoadByAssetID(ctx, conn, s.svc.scope, assetID, cursor) }, ) @@ -618,7 +618,7 @@ func (s VendorService) ListForProcessingActivityID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := vendors.LoadByProcessingActivityID(ctx, conn, s.svc.scope, processingActivityID, cursor) if err != nil { return fmt.Errorf("cannot load vendors by processing activity: %w", err) @@ -644,7 +644,7 @@ func (s VendorService) ListRiskAssessments( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return vendorRiskAssessments.LoadByVendorID(ctx, conn, s.svc.scope, vendorID, cursor) }, ) @@ -685,7 +685,7 @@ func (s VendorService) CreateRiskAssessment( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { vendor := coredata.Vendor{} if err := vendor.LoadByID(ctx, tx, s.svc.scope, req.VendorID); err != nil { return fmt.Errorf("cannot load vendor: %w", err) @@ -719,7 +719,7 @@ func (s VendorService) GetRiskAssessment( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return vendorRiskAssessment.LoadByID(ctx, conn, s.svc.scope, vendorRiskAssessmentID) }, ) @@ -739,7 +739,7 @@ func (s VendorService) GetByRiskAssessmentID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { vendorRiskAssessment := &coredata.VendorRiskAssessment{} if err := vendorRiskAssessment.LoadByID(ctx, conn, s.svc.scope, vendorRiskAssessmentID); err != nil { return fmt.Errorf("cannot load vendor risk assessment: %w", err) diff --git a/pkg/probo/vendor_service_service.go b/pkg/probo/vendor_service_service.go index 122891fb0..e5ce6c794 100644 --- a/pkg/probo/vendor_service_service.go +++ b/pkg/probo/vendor_service_service.go @@ -72,7 +72,7 @@ func (s VendorServiceService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := vendorService.LoadByID(ctx, conn, s.svc.scope, vendorServiceID) if err != nil { return fmt.Errorf("cannot load vendor service: %w", err) @@ -98,7 +98,7 @@ func (s VendorServiceService) List( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := vendorServices.LoadByVendorID(ctx, conn, s.svc.scope, vendorID, cursor) if err != nil { return fmt.Errorf("cannot load vendor services: %w", err) @@ -135,7 +135,7 @@ func (s VendorServiceService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { vendor := &coredata.Vendor{} if err := vendor.LoadByID(ctx, conn, s.svc.scope, req.VendorID); err != nil { return fmt.Errorf("cannot load vendor: %w", err) @@ -170,7 +170,7 @@ func (s VendorServiceService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { err := vendorService.LoadByID(ctx, conn, s.svc.scope, req.ID) if err != nil { return fmt.Errorf("cannot load vendor service: %w", err) @@ -206,7 +206,7 @@ func (s VendorServiceService) Delete( vendorService := coredata.VendorService{ID: vendorServiceID} return s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := vendorService.LoadByID(ctx, conn, s.svc.scope, vendorServiceID); err != nil { return fmt.Errorf("cannot load vendor service: %w", err) } diff --git a/pkg/probo/webhook_subscription_service.go b/pkg/probo/webhook_subscription_service.go index ac2b41ae5..f9273f451 100644 --- a/pkg/probo/webhook_subscription_service.go +++ b/pkg/probo/webhook_subscription_service.go @@ -72,7 +72,7 @@ func (s WebhookSubscriptionService) ListForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -107,7 +107,7 @@ func (s WebhookSubscriptionService) CountForOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { subscriptions := &coredata.WebhookSubscriptions{} count, err = subscriptions.CountByOrganizationID(ctx, conn, s.svc.scope, organizationID) if err != nil { @@ -133,7 +133,7 @@ func (s WebhookSubscriptionService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := wc.LoadByID(ctx, conn, s.svc.scope, webhookSubscriptionID); err != nil { return fmt.Errorf("cannot load webhook subscription: %w", err) } @@ -163,7 +163,7 @@ func (s WebhookSubscriptionService) Create( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := organization.LoadByID(ctx, conn, s.svc.scope, req.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) } @@ -208,7 +208,7 @@ func (s WebhookSubscriptionService) Update( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := wc.LoadByID(ctx, conn, s.svc.scope, req.WebhookSubscriptionID); err != nil { return fmt.Errorf("cannot load webhook subscription: %w", err) } @@ -245,7 +245,7 @@ func (s WebhookSubscriptionService) GetSigningSecret( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := wc.LoadByID(ctx, conn, s.svc.scope, webhookSubscriptionID); err != nil { return fmt.Errorf("cannot load webhook subscription: %w", err) } @@ -270,7 +270,7 @@ func (s WebhookSubscriptionService) ListEventsForSubscriptionID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := events.LoadBySubscriptionID(ctx, conn, s.svc.scope, webhookSubscriptionID, cursor); err != nil { return fmt.Errorf("cannot load webhook events: %w", err) } @@ -294,7 +294,7 @@ func (s WebhookSubscriptionService) CountEventsForSubscriptionID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { events := &coredata.WebhookEvents{} count, err = events.CountBySubscriptionID(ctx, conn, s.svc.scope, webhookSubscriptionID) @@ -321,7 +321,7 @@ func (s WebhookSubscriptionService) Delete( err := s.svc.pg.WithTx( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Tx) error { if err := wc.LoadByID(ctx, conn, s.svc.scope, webhookSubscriptionID); err != nil { return fmt.Errorf("cannot load webhook subscription: %w", err) } diff --git a/pkg/slack/sender.go b/pkg/slack/sender.go index 15c2fd2f5..f3c1d9c83 100644 --- a/pkg/slack/sender.go +++ b/pkg/slack/sender.go @@ -72,7 +72,7 @@ func (s *Sender) batchSendMessages(ctx context.Context) error { for { err := s.pg.WithTx( ctx, - func(tx pg.Conn) (err error) { + func(ctx context.Context, tx pg.Tx) (err error) { message := &coredata.SlackMessage{} defer func() { @@ -144,7 +144,7 @@ func (s *Sender) batchSendMessages(ctx context.Context) error { } } -func (s *Sender) sendMessage(ctx context.Context, tx pg.Conn, message *coredata.SlackMessage) (*string, *string, error) { +func (s *Sender) sendMessage(ctx context.Context, tx pg.Querier, message *coredata.SlackMessage) (*string, *string, error) { tenantID := message.ID.TenantID() scope := coredata.NewScope(tenantID) @@ -204,7 +204,7 @@ func (s *Sender) batchUpdateMessages(ctx context.Context) error { for { err := s.pg.WithTx( ctx, - func(tx pg.Conn) (err error) { + func(ctx context.Context, tx pg.Tx) (err error) { updateMessage := &coredata.SlackMessage{} defer func() { @@ -267,7 +267,7 @@ func (s *Sender) batchUpdateMessages(ctx context.Context) error { } } -func (s *Sender) updateMessage(ctx context.Context, tx pg.Conn, updateMessage *coredata.SlackMessage) error { +func (s *Sender) updateMessage(ctx context.Context, tx pg.Querier, updateMessage *coredata.SlackMessage) error { if updateMessage.ChannelID == nil || updateMessage.MessageTS == nil { return fmt.Errorf("slack message has no channel ID or message TS") } diff --git a/pkg/slack/service.go b/pkg/slack/service.go index 6ec80a03b..367db715d 100644 --- a/pkg/slack/service.go +++ b/pkg/slack/service.go @@ -89,7 +89,7 @@ func (s *Service) GetInitialSlackMessageByChannelAndTS( ) (*coredata.SlackMessage, error) { var slackMessage coredata.SlackMessage - err := s.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { if err := slackMessage.LoadInitialByChannelAndTS(ctx, conn, coredata.NewNoScope(), channelID, messageTS); err != nil { return fmt.Errorf("cannot load slack message: %w", err) } diff --git a/pkg/slack/slack_message_service.go b/pkg/slack/slack_message_service.go index 4cea1cc7a..f4d6ec0ba 100644 --- a/pkg/slack/slack_message_service.go +++ b/pkg/slack/slack_message_service.go @@ -83,7 +83,7 @@ func (s *SlackMessageService) GetSlackMessageDocumentIDs( ) (documentIDs []gid.GID, reportIDs []gid.GID, fileIDs []gid.GID, err error) { var slackMessage coredata.SlackMessage - err = s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err = s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { if err := slackMessage.LoadById(ctx, conn, s.svc.scope, slackMessageID); err != nil { return fmt.Errorf("cannot load slack message: %w", err) } @@ -108,7 +108,7 @@ func (s *SlackMessageService) UpdateSlackAccessMessage( responseURL string, requesterEmail mail.Addr, ) error { - return s.svc.pg.WithTx(ctx, func(tx pg.Conn) error { + return s.svc.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { var slackMessage coredata.SlackMessage if err := slackMessage.LoadById(ctx, tx, s.svc.scope, slackMessageID); err != nil { return fmt.Errorf("cannot load slack message: %w", err) @@ -187,7 +187,7 @@ func (s *SlackMessageService) QueueSlackNotification( identityID gid.GID, trustCenterID gid.GID, ) error { - return s.svc.pg.WithTx(ctx, func(tx pg.Conn) error { + return s.svc.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { var ( identity = &coredata.Identity{} trustCenterAccess *coredata.TrustCenterAccess @@ -306,7 +306,7 @@ func (s *SlackMessageService) QueueSlackNotification( func (s *SlackMessageService) loadDocumentsReportsAndFilesFromAccesses( ctx context.Context, - conn pg.Conn, + conn pg.Querier, trustCenterAccessID gid.GID, ) ( documents []SlackMessageDocument, diff --git a/pkg/trust/audit_service.go b/pkg/trust/audit_service.go index 4b5ada397..79f44d88a 100644 --- a/pkg/trust/audit_service.go +++ b/pkg/trust/audit_service.go @@ -36,7 +36,7 @@ func (s AuditService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := audit.LoadByID(ctx, conn, s.svc.scope, auditID) if err != nil { return fmt.Errorf("cannot load audit: %w", err) @@ -61,7 +61,7 @@ func (s AuditService) GetByReportID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := audit.LoadByReportID(ctx, conn, s.svc.scope, reportID) if err != nil { return fmt.Errorf("cannot load audit: %w", err) @@ -87,7 +87,7 @@ func (s AuditService) ListForOrganizationId( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { filter := coredata.NewAuditTrustCenterFilter() err := audits.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor, filter) if err != nil { diff --git a/pkg/trust/compliance_external_url_service.go b/pkg/trust/compliance_external_url_service.go index 4a07511ad..85e049e14 100644 --- a/pkg/trust/compliance_external_url_service.go +++ b/pkg/trust/compliance_external_url_service.go @@ -37,7 +37,7 @@ func (s ComplianceExternalURLService) ListForTrustCenterID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := items.LoadByTrustCenterID(ctx, conn, s.svc.scope, trustCenterID, cursor) if err != nil { return fmt.Errorf("cannot load compliance external URLs: %w", err) diff --git a/pkg/trust/compliance_framework_service.go b/pkg/trust/compliance_framework_service.go index 3ee85f587..d37264aa8 100644 --- a/pkg/trust/compliance_framework_service.go +++ b/pkg/trust/compliance_framework_service.go @@ -37,7 +37,7 @@ func (s ComplianceFrameworkService) ListByTrustCenterID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := complianceFrameworks.LoadByTrustCenterID(ctx, conn, s.svc.scope, trustCenterID, cursor) if err != nil { return fmt.Errorf("cannot load compliance frameworks: %w", err) diff --git a/pkg/trust/document_service.go b/pkg/trust/document_service.go index 24f966eec..c4e21160f 100644 --- a/pkg/trust/document_service.go +++ b/pkg/trust/document_service.go @@ -54,7 +54,7 @@ func (s *DocumentService) ListForOrganizationId( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { filter := coredata.NewDocumentTrustCenterFilter() if err := documents.LoadPublishedByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor, filter); err != nil { @@ -106,7 +106,7 @@ func (s DocumentService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := document.LoadByID(ctx, conn, s.svc.scope, documentID) if err != nil { return fmt.Errorf("cannot load document: %w", err) @@ -146,7 +146,7 @@ func (s *DocumentService) exportPDFData( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := document.LoadByID(ctx, conn, s.svc.scope, documentID); err != nil { return fmt.Errorf("cannot load document: %w", err) } @@ -234,7 +234,7 @@ func (s *DocumentService) exportPDFData( horizontalLogoBase64 := "" if organization.HorizontalLogoFileID != nil { fileRecord := &coredata.File{} - fileErr := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + fileErr := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { return fileRecord.LoadByID(ctx, conn, s.svc.scope, *organization.HorizontalLogoFileID) }) if fileErr == nil { diff --git a/pkg/trust/framework_service.go b/pkg/trust/framework_service.go index 62ef0f683..2b89d1cb3 100644 --- a/pkg/trust/framework_service.go +++ b/pkg/trust/framework_service.go @@ -35,7 +35,7 @@ func (s FrameworkService) Get( ) (*coredata.Framework, error) { framework := &coredata.Framework{} - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { err := framework.LoadByID(ctx, conn, s.svc.scope, frameworkID) if err != nil { return fmt.Errorf("cannot load framework: %w", err) @@ -60,7 +60,7 @@ func (s FrameworkService) GenerateLightLogoURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { framework := &coredata.Framework{} if err := framework.LoadByID(ctx, conn, s.svc.scope, frameworkID); err != nil { return fmt.Errorf("cannot load framework: %w", err) @@ -102,7 +102,7 @@ func (s FrameworkService) GenerateDarkLogoURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { framework := &coredata.Framework{} if err := framework.LoadByID(ctx, conn, s.svc.scope, frameworkID); err != nil { return fmt.Errorf("cannot load framework: %w", err) diff --git a/pkg/trust/organization_service.go b/pkg/trust/organization_service.go index b0d86bb34..ccd453462 100644 --- a/pkg/trust/organization_service.go +++ b/pkg/trust/organization_service.go @@ -38,7 +38,7 @@ func (s OrganizationService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := organization.LoadByID( ctx, conn, @@ -68,7 +68,7 @@ func (s OrganizationService) GetOrganizationCustomDomain( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var org coredata.Organization if err := org.LoadByID(ctx, conn, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -111,7 +111,7 @@ func (s OrganizationService) GenerateLogoURL( file := &coredata.File{} err = s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return file.LoadByID(ctx, conn, s.svc.scope, *organization.LogoFileID) }, ) diff --git a/pkg/trust/report_service.go b/pkg/trust/report_service.go index 0a520468c..32ea9b297 100644 --- a/pkg/trust/report_service.go +++ b/pkg/trust/report_service.go @@ -57,7 +57,7 @@ func (s ReportService) loadByID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := report.LoadByID(ctx, conn, s.svc.scope, reportID) if err != nil { return fmt.Errorf("cannot load report: %w", err) diff --git a/pkg/trust/service.go b/pkg/trust/service.go index 4ee8d6f09..720c16f90 100644 --- a/pkg/trust/service.go +++ b/pkg/trust/service.go @@ -146,7 +146,7 @@ func (s *Service) Get( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := trustCenter.LoadByID(ctx, conn, coredata.NewNoScope(), id) if err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { @@ -174,7 +174,7 @@ func (s *Service) GetBySlug( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := trustCenter.LoadBySlug(ctx, conn, slug) if err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { @@ -199,7 +199,7 @@ func (s *Service) GetByDomainName(ctx context.Context, domain string) (*coredata err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { var customDomain coredata.CustomDomain if err := customDomain.LoadByDomain(ctx, conn, coredata.NewNoScope(), domain); err != nil { if errors.Is(err, coredata.ErrResourceNotFound) { @@ -243,7 +243,7 @@ func (s *Service) GetCustomDomainByOrganizationID(ctx context.Context, organizat err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return customDomain.LoadByOrganizationID(ctx, conn, coredata.NewNoScope(), organizationID) }, ) @@ -264,7 +264,7 @@ func (s *Service) GetCustomDomainByOrganizationID(ctx context.Context, organizat func (s *Service) EmailPresenterConfigByOrganizationID(ctx context.Context, orgID gid.GID) (emails.PresenterConfig, error) { var trustCenter coredata.TrustCenter scope := coredata.NewScopeFromObjectID(orgID) - err := s.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { return trustCenter.LoadByOrganizationID(ctx, conn, scope, orgID) }) if err != nil { @@ -286,7 +286,7 @@ func (s *Service) GetOrganizationByTrustCenterID( err = s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return org.LoadByID(ctx, conn, coredata.NewNoScope(), trustCenter.OrganizationID) }, ) @@ -302,7 +302,7 @@ func (s *Service) GetMembershipByCompliancePageIDAndIdentityID(ctx context.Conte err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { return membership.LoadByTrustCenterIDAndIdentityID( ctx, conn, @@ -334,7 +334,7 @@ func (s *Service) GetNDAFile( err := s.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { trustCenter := &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, conn, scope, compliancePageID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -376,7 +376,7 @@ func (s *Service) ProvisionMember( err := s.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { compliancePage := &coredata.TrustCenter{} if err := compliancePage.LoadByID(ctx, tx, scope, compliancePageID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) diff --git a/pkg/trust/trust_center_access_service.go b/pkg/trust/trust_center_access_service.go index c148de292..ea4c07604 100644 --- a/pkg/trust/trust_center_access_service.go +++ b/pkg/trust/trust_center_access_service.go @@ -60,7 +60,7 @@ func (s TrustCenterAccessService) Request( err := s.svc.pg.WithTx( ctx, - func(tx pg.Conn) error { + func(ctx context.Context, tx pg.Tx) error { trustCenter := &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, tx, s.svc.scope, req.TrustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -192,7 +192,7 @@ func (s TrustCenterAccessService) GetAccess( ) (coredata.TrustCenterAccess, error) { var access coredata.TrustCenterAccess - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { return access.LoadByTrustCenterIDAndIdentityID(ctx, conn, s.svc.scope, trustCenterID, identityID) }) @@ -207,7 +207,7 @@ func (s TrustCenterAccessService) GetDocumentAccess( ) (*coredata.TrustCenterDocumentAccess, error) { var documentAccess *coredata.TrustCenterDocumentAccess - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { access := &coredata.TrustCenterAccess{} err := access.LoadByTrustCenterIDAndIdentityID(ctx, conn, s.svc.scope, trustCenterID, identityID) if err != nil { @@ -257,7 +257,7 @@ func (s TrustCenterAccessService) GetReportAccess( ) (*coredata.TrustCenterDocumentAccess, error) { var reportAccess *coredata.TrustCenterDocumentAccess - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { access := &coredata.TrustCenterAccess{} err := access.LoadByTrustCenterIDAndIdentityID(ctx, conn, s.svc.scope, trustCenterID, identityID) if err != nil { @@ -307,7 +307,7 @@ func (s TrustCenterAccessService) GetTrustCenterFileAccess( ) (*coredata.TrustCenterDocumentAccess, error) { var fileAccess *coredata.TrustCenterDocumentAccess - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { access := &coredata.TrustCenterAccess{} err := access.LoadByTrustCenterIDAndIdentityID(ctx, conn, s.svc.scope, trustCenterID, identityID) if err != nil { @@ -357,7 +357,7 @@ func (s *TrustCenterAccessService) GrantByIDs( reportIDs []gid.GID, fileIDs []gid.GID, ) error { - return s.svc.pg.WithTx(ctx, func(tx pg.Conn) error { + return s.svc.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { trustCenter := &coredata.TrustCenter{} if err := trustCenter.LoadByOrganizationID(ctx, tx, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -419,7 +419,7 @@ func (s *TrustCenterAccessService) GrantByIDs( }) } -func (s *TrustCenterAccessService) sendAccessEmail(ctx context.Context, tx pg.Conn, access *coredata.TrustCenterAccess, profile *coredata.MembershipProfile) error { +func (s *TrustCenterAccessService) sendAccessEmail(ctx context.Context, tx pg.Tx, access *coredata.TrustCenterAccess, profile *coredata.MembershipProfile) error { organization := &coredata.Organization{} if err := organization.LoadByID(ctx, tx, s.svc.scope, access.OrganizationID); err != nil { return fmt.Errorf("cannot load organization: %w", err) @@ -469,7 +469,7 @@ func (s *TrustCenterAccessService) RejectOrRevokeByIDs( reportIDs []gid.GID, fileIDs []gid.GID, ) error { - return s.svc.pg.WithTx(ctx, func(tx pg.Conn) error { + return s.svc.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { trustCenter := &coredata.TrustCenter{} if err := trustCenter.LoadByOrganizationID(ctx, tx, s.svc.scope, organizationID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -524,7 +524,7 @@ func (s *TrustCenterAccessService) RejectOrRevokeByIDs( func (s *TrustCenterAccessService) sendDocumentAccessRejectedEmail( ctx context.Context, - tx pg.Conn, + tx pg.Tx, access *coredata.TrustCenterAccess, profile *coredata.MembershipProfile, documentIDs []gid.GID, diff --git a/pkg/trust/trust_center_file_service.go b/pkg/trust/trust_center_file_service.go index 5e6125f83..7c92a02c6 100644 --- a/pkg/trust/trust_center_file_service.go +++ b/pkg/trust/trust_center_file_service.go @@ -41,7 +41,7 @@ func (s *TrustCenterFileService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := trustCenterFile.LoadByID(ctx, conn, s.svc.scope, trustCenterFileID) if err != nil { return fmt.Errorf("cannot load trust center file: %w", err) @@ -76,7 +76,7 @@ func (s *TrustCenterFileService) ListForOrganizationId( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := trustCenterFiles.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID, cursor, filter) if err != nil { return fmt.Errorf("cannot load trust center files: %w", err) @@ -128,7 +128,7 @@ func (s *TrustCenterFileService) exportFileData( var trustCenterFile *coredata.TrustCenterFile var file *coredata.File - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { trustCenterFile = &coredata.TrustCenterFile{} if err := trustCenterFile.LoadByID(ctx, conn, s.svc.scope, trustCenterFileID); err != nil { return fmt.Errorf("cannot load trust center file: %w", err) diff --git a/pkg/trust/trust_center_reference_service.go b/pkg/trust/trust_center_reference_service.go index 999ef20ea..97ce2a4a7 100644 --- a/pkg/trust/trust_center_reference_service.go +++ b/pkg/trust/trust_center_reference_service.go @@ -38,7 +38,7 @@ func (s TrustCenterReferenceService) ListForTrustCenterID( ) (*page.Page[*coredata.TrustCenterReference, coredata.TrustCenterReferenceOrderField], error) { var references coredata.TrustCenterReferences - err := s.svc.pg.WithConn(ctx, func(conn pg.Conn) error { + err := s.svc.pg.WithConn(ctx, func(ctx context.Context, conn pg.Querier) error { err := references.LoadByTrustCenterID(ctx, conn, s.svc.scope, trustCenterID, cursor) if err != nil { return fmt.Errorf("cannot load trust center references: %w", err) @@ -61,7 +61,7 @@ func (s TrustCenterReferenceService) GenerateLogoURL( ) (string, error) { reference := &coredata.TrustCenterReference{} file := &coredata.File{} - err := s.svc.pg.WithTx(ctx, func(tx pg.Conn) error { + err := s.svc.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { err := reference.LoadByID(ctx, tx, s.svc.scope, referenceID) if err != nil { return fmt.Errorf("cannot load trust center reference: %w", err) @@ -108,7 +108,7 @@ func (s TrustCenterReferenceService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := reference.LoadByID(ctx, conn, s.svc.scope, referenceID) if err != nil { return fmt.Errorf("cannot load trust center reference: %w", err) diff --git a/pkg/trust/trust_center_service.go b/pkg/trust/trust_center_service.go index 34543c2fe..289206efb 100644 --- a/pkg/trust/trust_center_service.go +++ b/pkg/trust/trust_center_service.go @@ -39,7 +39,7 @@ func (s TrustCenterService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { trustCenter = &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, conn, s.svc.scope, trustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -64,7 +64,7 @@ func (s TrustCenterService) GetByOrganizationID( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := trustCenter.LoadByOrganizationID(ctx, conn, s.svc.scope, organizationID) if err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -89,7 +89,7 @@ func (s TrustCenterService) GetNDAFile( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { trustCenter := &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, conn, s.svc.scope, trustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -123,7 +123,7 @@ func (s TrustCenterService) GenerateNDAFileURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { trustCenter := &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, conn, s.svc.scope, trustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) @@ -163,7 +163,7 @@ func (s TrustCenterService) GenerateLogoURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := compliancePage.LoadByID(ctx, conn, s.svc.scope, compliancePageID); err != nil { return fmt.Errorf("cannot load compliance page: %w", err) } @@ -209,7 +209,7 @@ func (s TrustCenterService) GenerateDarkLogoURL( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := compliancePage.LoadByID(ctx, conn, s.svc.scope, compliancePageID); err != nil { return fmt.Errorf("cannot load compliance page: %w", err) } @@ -258,7 +258,7 @@ func (s *TrustCenterService) EmailPresenterConfig(ctx context.Context, complianc err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { if err := compliancePage.LoadByID(ctx, conn, scope, compliancePageID); err != nil { return fmt.Errorf("cannot load compliance page: %w", err) } @@ -342,7 +342,7 @@ func (s *TrustCenterService) GetMailingList( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { trustCenter := &coredata.TrustCenter{} if err := trustCenter.LoadByID(ctx, conn, s.svc.scope, trustCenterID); err != nil { return fmt.Errorf("cannot load trust center: %w", err) diff --git a/pkg/trust/vendor_service.go b/pkg/trust/vendor_service.go index 000008ab9..0b03424b3 100644 --- a/pkg/trust/vendor_service.go +++ b/pkg/trust/vendor_service.go @@ -36,7 +36,7 @@ func (s VendorService) Get( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { err := vendor.LoadByID(ctx, conn, s.svc.scope, vendorID) if err != nil { return fmt.Errorf("cannot load vendor: %w", err) @@ -62,7 +62,7 @@ func (s VendorService) ListForOrganizationId( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) error { + func(ctx context.Context, conn pg.Querier) error { showOnTrustCenter := true var nilSnapshotID *gid.GID = nil filter := coredata.NewVendorFilter(&nilSnapshotID, &showOnTrustCenter) @@ -91,7 +91,7 @@ func (s VendorService) CountForTrustCenterId( err := s.svc.pg.WithConn( ctx, - func(conn pg.Conn) (err error) { + func(ctx context.Context, conn pg.Querier) (err error) { trustCenter, err := s.svc.TrustCenters.Get(ctx, trustCenterID) if err != nil { return fmt.Errorf("cannot load trust center: %w", err) diff --git a/pkg/webhook/data.go b/pkg/webhook/data.go index 36eb13f13..65f1f9ed3 100644 --- a/pkg/webhook/data.go +++ b/pkg/webhook/data.go @@ -36,14 +36,14 @@ type Payload struct { func InsertData( ctx context.Context, - conn pg.Conn, + tx pg.Tx, scope coredata.Scoper, organizationID gid.GID, eventType coredata.WebhookEventType, data any, ) error { var configs coredata.WebhookSubscriptions - exists, err := configs.ExistsByOrganizationIDAndEventType(ctx, conn, scope, organizationID, eventType) + exists, err := configs.ExistsByOrganizationIDAndEventType(ctx, tx, scope, organizationID, eventType) if err != nil { return fmt.Errorf("cannot check webhook subscriptions: %w", err) } @@ -65,7 +65,7 @@ func InsertData( CreatedAt: time.Now(), } - if err = webhookData.Insert(ctx, conn, scope); err != nil { + if err = webhookData.Insert(ctx, tx, scope); err != nil { return fmt.Errorf("cannot insert webhook data: %w", err) } diff --git a/pkg/webhook/sender.go b/pkg/webhook/sender.go index 3f6a0c345..fc18f4a64 100644 --- a/pkg/webhook/sender.go +++ b/pkg/webhook/sender.go @@ -131,7 +131,7 @@ func (s *Sender) claimNextWebhookData(ctx context.Context) (*coredata.WebhookDat var webhookData coredata.WebhookData var deliveries []pendingDelivery - err := s.pg.WithTx(ctx, func(tx pg.Conn) error { + err := s.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { if err := webhookData.LoadNextUnprocessedForUpdate(ctx, tx); err != nil { return fmt.Errorf("cannot load next unprocessed webhook data: %w", err) } @@ -234,8 +234,8 @@ func (s *Sender) updateEventStatus( event.Status = status event.Response = response - err := s.pg.WithConn(ctx, func(conn pg.Conn) error { - return event.UpdateStatus(ctx, conn, scope) + err := s.pg.WithTx(ctx, func(ctx context.Context, tx pg.Tx) error { + return event.UpdateStatus(ctx, tx, scope) }) if err != nil { s.logger.ErrorCtx(