rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to kit v0.3.0

Browse Source 
Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
Bryan Frimin
2026-04-03 10:56:06 +02:00
parent 8adf26ad20
commit f17fb7bf49
191 changed files with 1617 additions and 1617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/migrate-document-versions-markdown/main.go
View File

@@ -127,7 +127,7 @@ ORDER BY id;
return nil 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) versionID, err := gid.ParseGID(idStr)
if err != nil { if err != nil {
return fmt.Errorf("invalid document version id %q: %w", idStr, err) return fmt.Errorf("invalid document version id %q: %w", idStr, err)

32
go.mod
View File

@@ -20,7 +20,7 @@ require (
github.com/digitorus/timestamp v0.0.0-20250524132541-c45532741eea github.com/digitorus/timestamp v0.0.0-20250524132541-c45532741eea
github.com/go-chi/chi/v5 v5.2.5 github.com/go-chi/chi/v5 v5.2.5
github.com/go-chi/cors v1.2.2 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/jhillyerd/enmime v1.3.0
github.com/microcosm-cc/bluemonday v1.0.27 github.com/microcosm-cc/bluemonday v1.0.27
github.com/modelcontextprotocol/go-sdk v1.4.1 github.com/modelcontextprotocol/go-sdk v1.4.1
@@ -35,10 +35,10 @@ require (
github.com/vikstrous/dataloadgen v0.0.10 github.com/vikstrous/dataloadgen v0.0.10
github.com/yuin/goldmark v1.4.13 github.com/yuin/goldmark v1.4.13
go.gearno.de/crypto/uuid v0.1.1-0.20251208105319-3f587312a712 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.gearno.de/x/ref v0.0.0-20260216110753-a700c951377c
go.opentelemetry.io/otel v1.40.0 go.opentelemetry.io/otel v1.42.0
go.opentelemetry.io/otel/trace v1.40.0 go.opentelemetry.io/otel/trace v1.42.0
go.probo.inc/mcpgen v0.0.0-20260223192226-386b1fbe6184 go.probo.inc/mcpgen v0.0.0-20260223192226-386b1fbe6184
golang.org/x/crypto v0.49.0 golang.org/x/crypto v0.49.0
golang.org/x/image v0.38.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/digitorus/pkcs7 v0.0.0-20230713084857-e76b763bdc49 // indirect
github.com/dnephin/pflag v1.0.7 // indirect github.com/dnephin/pflag v1.0.7 // indirect
github.com/elimity-com/scim v0.0.0-20240320110924-172bf2aee9c8 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/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/go-json-experiment/json v0.0.0-20251027170946-4849db3c2f7e // 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/enterprise-certificate-proxy v0.3.12 // indirect
github.com/googleapis/gax-go/v2 v2.17.0 // indirect github.com/googleapis/gax-go/v2 v2.17.0 // indirect
github.com/gorilla/websocket v1.5.3 // 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/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/hhrutter/lzw v1.0.0 // indirect github.com/hhrutter/lzw v1.0.0 // indirect
github.com/hhrutter/pkcs7 v0.2.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/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.67.5 // 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/russellhaering/goxmldsig v1.6.0 // indirect
github.com/segmentio/asm v1.1.3 // indirect github.com/segmentio/asm v1.1.3 // indirect
github.com/segmentio/encoding v0.5.4 // indirect github.com/segmentio/encoding v0.5.4 // indirect
@@ -161,21 +161,21 @@ require (
go.gearno.de/x/panicf v0.1.1 // indirect go.gearno.de/x/panicf v0.1.1 // indirect
go.opentelemetry.io/auto/sdk v1.2.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/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 v1.42.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.40.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0 // indirect
go.opentelemetry.io/otel/metric v1.40.0 // indirect go.opentelemetry.io/otel/metric v1.42.0 // indirect
go.opentelemetry.io/otel/sdk v1.40.0 go.opentelemetry.io/otel/sdk v1.42.0
go.opentelemetry.io/proto/otlp v1.9.0 // indirect go.opentelemetry.io/proto/otlp v1.10.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect go.yaml.in/yaml/v2 v2.4.4 // indirect
golang.org/x/mod v0.34.0 // indirect golang.org/x/mod v0.34.0 // indirect
golang.org/x/net v0.52.0 golang.org/x/net v0.52.0
golang.org/x/sys v0.42.0 // indirect golang.org/x/sys v0.42.0 // indirect
golang.org/x/term v0.41.0 golang.org/x/term v0.41.0
golang.org/x/text v0.35.0 // indirect golang.org/x/text v0.35.0 // indirect
golang.org/x/tools v0.43.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/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
google.golang.org/grpc v1.79.3 // indirect google.golang.org/grpc v1.80.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect
gotest.tools/gotestsum v1.13.0 // indirect gotest.tools/gotestsum v1.13.0 // indirect

72
go.sum
View File

@@ -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/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 h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM= 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.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w=
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= 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 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= 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/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 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= 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.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
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/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 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
github.com/hhrutter/lzw v1.0.0 h1:laL89Llp86W3rRs83LvKbwYRx6INE8gDn0XNb1oXtm0= 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/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 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= 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.9.1 h1:uwrxJXBnx76nyISkhr33kQLlUqjv7et7b9FjCen/tdc=
github.com/jackc/pgx/v5 v5.8.0/go.mod h1:QVeDInX2m9VyzvNeiCJVjCkNFqzsNb43204HshNSZKw= 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 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= 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= 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/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 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4=
github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw= 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.1 h1:XwbrGOIplXW/AU3YhIhLODXMJYyC1isLFfYCsTEycfc=
github.com/prometheus/procfs v0.20.0/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo= 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 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= 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= 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 h1:J5ccbcxFuwxe6Oa9fVi9FqQOo+n17ni4wbl9t4NuEzc=
go.gearno.de/crypto/uuid v0.1.1-0.20251208105319-3f587312a712/go.mod h1:fnIIvKO9QnsyLO3ZJLJT3r8KZv/p0FOeT5eZKilYWXg= 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.3.0 h1:c+0wY9ydGQIbLNvkcDv/1geC9htv1z2GDMOPxkZzoM4=
go.gearno.de/kit v0.1.1/go.mod h1:WI/gQ14O9M6wsKa/HFL4ZH+Q/U0930hYWZRdHHo9Agk= 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 h1:E3Cr9NB8Ry2EsvEG/1eHr7kplP3tEjTf5d56dTX64VQ=
go.gearno.de/x/panicf v0.1.1/go.mod h1:VnB8oF0UefMZcYeD4v+Wk4U5Z1uza7PHLlhT2CbNEbU= 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= 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/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 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= 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.42.0 h1:lSQGzTgVR3+sgJDAU/7/ZMjN9Z+vUip7leaqBKy4sho=
go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g= go.opentelemetry.io/otel v1.42.0/go.mod h1:lJNsdRMxCUIWuMlVJWzecSMuNjE7dOYyWlqOXWkdqCc=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 h1:QKdN8ly8zEMrByybbQgv8cWBcdAarwmIPZ6FThrWXJs= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0 h1:THuZiwpQZuHPul65w4WcwEnkX2QIuMT+UFoOrygtoJw=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0/go.mod h1:bTdK1nhqF76qiPoCCdyFIV+N/sRHYXYCTQc+3VCi3MI= 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.40.0 h1:wVZXIWjQSeSmMoxF74LzAnpVQOAFDo3pPji9Y4SOFKc= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0 h1:uLXP+3mghfMf7XmV4PkGfFhFKuNWoCvvx5wP/wOXo0o=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.40.0/go.mod h1:khvBS2IggMFNwZK/6lEeHg/W57h/IX6J4URh57fuI40= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0/go.mod h1:v0Tj04armyT59mnURNUJf7RCKcKzq+lgJs6QSjHjaTc=
go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g= go.opentelemetry.io/otel/metric v1.42.0 h1:2jXG+3oZLNXEPfNmnpxKDeZsFI5o4J+nz6xUlaFdF/4=
go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc= go.opentelemetry.io/otel/metric v1.42.0/go.mod h1:RlUN/7vTU7Ao/diDkEpQpnz3/92J9ko05BIwxYa2SSI=
go.opentelemetry.io/otel/sdk v1.40.0 h1:KHW/jUzgo6wsPh9At46+h4upjtccTmuZCFAc9OJ71f8= go.opentelemetry.io/otel/sdk v1.42.0 h1:LyC8+jqk6UJwdrI/8VydAq/hvkFKNHZVIWuslJXYsDo=
go.opentelemetry.io/otel/sdk v1.40.0/go.mod h1:Ph7EFdYvxq72Y8Li9q8KebuYUr2KoeyHx0DRMKrYBUE= go.opentelemetry.io/otel/sdk v1.42.0/go.mod h1:rGHCAxd9DAph0joO4W6OPwxjNTYWghRWmkHuGbayMts=
go.opentelemetry.io/otel/sdk/metric v1.40.0 h1:mtmdVqgQkeRxHgRv4qhyJduP3fYJRMX4AtAlbuWdCYw= go.opentelemetry.io/otel/sdk/metric v1.42.0 h1:D/1QR46Clz6ajyZ3G8SgNlTJKBdGp84q9RKCAZ3YGuA=
go.opentelemetry.io/otel/sdk/metric v1.40.0/go.mod h1:4Z2bGMf0KSK3uRjlczMOeMhKU2rhUqdWNoKcYrtcBPg= go.opentelemetry.io/otel/sdk/metric v1.42.0/go.mod h1:Ua6AAlDKdZ7tdvaQKfSmnFTdHx37+J4ba8MwVCYM5hc=
go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw= go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY=
go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA= go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc=
go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A= go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4= 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 h1:LH9uUR10Nt6ixEAtr7M8Drg97Ei519WEWM1mSWLkrhQ=
go.probo.inc/mcpgen v0.0.0-20260223192226-386b1fbe6184/go.mod h1:HunWQGqLdMocExJh4tWaX7p+uRZ9GlKvBvOXHaFW6vM= 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 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= 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.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= 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 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= 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= 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/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 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0= 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.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= 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 h1:qDrTOxKUQ/P0MveH6a7vZ+DNHxJQjtGm/uvdbdGXCQg=
google.golang.org/api v0.269.0/go.mod h1:N8Wpcu23Tlccl0zSHEkcAZQKDLdquxK+l9r2LkwAauE= 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 h1:VQZ/yAbAtjkHgH80teYd2em3xtIkkHd7ZhqfH2N9CsM=
google.golang.org/genproto v0.0.0-20260128011058-8636f8732409/go.mod h1:rxKD3IEILWEu3P44seeNOAwZN4SaoKaQ/2eTg4mM6EM= 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-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409/go.mod h1:fl8J1IvUjCilwZzQowmw2b7HQB2eAuYBabMXzWurF+I= 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-20260217215200-42d3e9bedb6d h1:t/LOSXPJ9R0B6fnZNyALBRfZBH0Uy0gT+uR+SJ6syqQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE= google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ= 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 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= 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= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

24
pkg/accessreview/access_entry_service.go
View File

@@ -54,7 +54,7 @@ func (s AccessEntryService) Get(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
return entry.LoadByID(ctx, conn, s.scope, entryID) return entry.LoadByID(ctx, conn, s.scope, entryID)
}, },
) )
@@ -83,7 +83,7 @@ func (s AccessEntryService) RecordDecision(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, 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 { if err := entry.LoadByID(ctx, conn, s.scope, req.EntryID); err != nil {
return fmt.Errorf("cannot load access entry: %w", err) return fmt.Errorf("cannot load access entry: %w", err)
} }
@@ -173,7 +173,7 @@ func (s AccessEntryService) RecordDecisions(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Tx) error {
// Track verified campaigns to avoid repeated loads within the // Track verified campaigns to avoid repeated loads within the
// same transaction. // same transaction.
verifiedCampaigns := make(map[gid.GID]bool) verifiedCampaigns := make(map[gid.GID]bool)
@@ -259,7 +259,7 @@ func (s AccessEntryService) FlagEntry(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, 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 { if err := entry.LoadByID(ctx, conn, s.scope, req.EntryID); err != nil {
return fmt.Errorf("cannot load access entry: %w", err) return fmt.Errorf("cannot load access entry: %w", err)
} }
@@ -304,7 +304,7 @@ func (s AccessEntryService) ListForCampaignID(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
return entries.LoadByCampaignID(ctx, conn, s.scope, campaignID, cursor, filter) return entries.LoadByCampaignID(ctx, conn, s.scope, campaignID, cursor, filter)
}, },
) )
@@ -326,7 +326,7 @@ func (s AccessEntryService) ListForCampaignIDAndSourceID(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, 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) return entries.LoadByCampaignIDAndSourceID(ctx, conn, s.scope, campaignID, sourceID, cursor, filter)
}, },
) )
@@ -346,7 +346,7 @@ func (s AccessEntryService) CountForCampaignID(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) (err error) { func(ctx context.Context, conn pg.Querier) (err error) {
entries := coredata.AccessEntries{} entries := coredata.AccessEntries{}
count, err = entries.CountByCampaignID(ctx, conn, s.scope, campaignID, filter) count, err = entries.CountByCampaignID(ctx, conn, s.scope, campaignID, filter)
if err != nil { if err != nil {
@@ -372,7 +372,7 @@ func (s AccessEntryService) CountForCampaignIDAndSourceID(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) (err error) { func(ctx context.Context, conn pg.Querier) (err error) {
entries := coredata.AccessEntries{} entries := coredata.AccessEntries{}
count, err = entries.CountByCampaignIDAndSourceID(ctx, conn, s.scope, campaignID, sourceID, filter) count, err = entries.CountByCampaignIDAndSourceID(ctx, conn, s.scope, campaignID, sourceID, filter)
if err != nil { if err != nil {
@@ -396,7 +396,7 @@ func (s AccessEntryService) CountPendingForCampaignID(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) (err error) { func(ctx context.Context, conn pg.Querier) (err error) {
entries := coredata.AccessEntries{} entries := coredata.AccessEntries{}
count, err = entries.CountPendingByCampaignID(ctx, conn, s.scope, campaignID) count, err = entries.CountPendingByCampaignID(ctx, conn, s.scope, campaignID)
if err != nil { if err != nil {
@@ -420,7 +420,7 @@ func (s AccessEntryService) DecisionHistory(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
return histories.LoadByEntryID(ctx, conn, s.scope, entryID) return histories.LoadByEntryID(ctx, conn, s.scope, entryID)
}, },
) )
@@ -439,7 +439,7 @@ func (s AccessEntryService) Statistics(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
return stats.LoadByCampaignID(ctx, conn, s.scope, campaignID) return stats.LoadByCampaignID(ctx, conn, s.scope, campaignID)
}, },
) )
@@ -459,7 +459,7 @@ func (s AccessEntryService) StatisticsForSource(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
return stats.LoadByCampaignIDAndSourceID(ctx, conn, s.scope, campaignID, sourceID) return stats.LoadByCampaignIDAndSourceID(ctx, conn, s.scope, campaignID, sourceID)
}, },
) )

24
pkg/accessreview/access_source_service.go
View File

@@ -114,7 +114,7 @@ func (s AccessSourceService) Create(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Tx) error {
// Validate connector exists if provided // Validate connector exists if provided
if req.ConnectorID != nil { if req.ConnectorID != nil {
connector := &coredata.Connector{} connector := &coredata.Connector{}
@@ -145,7 +145,7 @@ func (s AccessSourceService) Get(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
return source.LoadByID(ctx, conn, s.scope, accessSourceID) return source.LoadByID(ctx, conn, s.scope, accessSourceID)
}, },
) )
@@ -168,7 +168,7 @@ func (s AccessSourceService) Update(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, 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 { if err := source.LoadByID(ctx, conn, s.scope, req.AccessSourceID); err != nil {
return fmt.Errorf("cannot load access source: %w", err) return fmt.Errorf("cannot load access source: %w", err)
} }
@@ -219,7 +219,7 @@ func (s AccessSourceService) Delete(
return s.pg.WithTx( return s.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Tx) error {
return source.Delete(ctx, conn, s.scope) return source.Delete(ctx, conn, s.scope)
}, },
) )
@@ -234,7 +234,7 @@ func (s AccessSourceService) ListForOrganizationID(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
return sources.LoadByOrganizationID(ctx, conn, s.scope, organizationID, cursor) return sources.LoadByOrganizationID(ctx, conn, s.scope, organizationID, cursor)
}, },
) )
@@ -253,7 +253,7 @@ func (s AccessSourceService) CountForOrganizationID(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) (err error) { func(ctx context.Context, conn pg.Querier) (err error) {
sources := coredata.AccessSources{} sources := coredata.AccessSources{}
count, err = sources.CountByOrganizationID(ctx, conn, s.scope, organizationID) count, err = sources.CountByOrganizationID(ctx, conn, s.scope, organizationID)
return err return err
@@ -274,7 +274,7 @@ func (s AccessSourceService) ListScopeSourcesForCampaignID(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
return sources.LoadScopeSourcesByCampaignID(ctx, conn, s.scope, campaignID) return sources.LoadScopeSourcesByCampaignID(ctx, conn, s.scope, campaignID)
}, },
) )
@@ -296,7 +296,7 @@ func (s AccessSourceService) ConnectorHTTPClient(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, 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 { if err := dbConnector.LoadByID(ctx, conn, s.scope, connectorID, s.encryptionKey); err != nil {
return fmt.Errorf("cannot load connector: %w", err) return fmt.Errorf("cannot load connector: %w", err)
} }
@@ -336,10 +336,10 @@ func (s AccessSourceService) ConnectorHTTPClient(
// Persist refreshed token if it changed. // Persist refreshed token if it changed.
if isOAuth2 && oauth2Conn.AccessToken != tokenBefore { if isOAuth2 && oauth2Conn.AccessToken != tokenBefore {
dbConnector.UpdatedAt = time.Now() dbConnector.UpdatedAt = time.Now()
if err := s.pg.WithConn( if err := s.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
return dbConnector.Update(ctx, conn, s.scope, s.encryptionKey) return dbConnector.Update(ctx, tx, s.scope, s.encryptionKey)
}, },
); err != nil { ); err != nil {
return nil, nil, fmt.Errorf("cannot persist refreshed token: %w", err) return nil, nil, fmt.Errorf("cannot persist refreshed token: %w", err)
@@ -361,7 +361,7 @@ func (s AccessSourceService) ConfigureAccessSource(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, 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 { if err := source.LoadByID(ctx, conn, s.scope, req.AccessSourceID); err != nil {
return fmt.Errorf("cannot load access source: %w", err) return fmt.Errorf("cannot load access source: %w", err)
} }

32
pkg/accessreview/campaign_service.go
View File

@@ -59,7 +59,7 @@ func (s *CampaignService) Create(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Tx) error {
if err := campaign.Insert(ctx, conn, s.scope); err != nil { if err := campaign.Insert(ctx, conn, s.scope); err != nil {
return fmt.Errorf("cannot insert access review campaign: %w", err) return fmt.Errorf("cannot insert access review campaign: %w", err)
} }
@@ -101,7 +101,7 @@ func (s *CampaignService) Get(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, 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 { if err := campaign.LoadByID(ctx, conn, s.scope, campaignID); err != nil {
return fmt.Errorf("cannot load campaign: %w", err) return fmt.Errorf("cannot load campaign: %w", err)
} }
@@ -127,7 +127,7 @@ func (s *CampaignService) Update(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, 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 { if err := lockCampaignForUpdate(ctx, conn, s.scope, req.CampaignID); err != nil {
return fmt.Errorf("cannot lock campaign: %w", err) return fmt.Errorf("cannot lock campaign: %w", err)
} }
@@ -174,7 +174,7 @@ func (s *CampaignService) Delete(
) error { ) error {
return s.pg.WithTx( return s.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Tx) error {
if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil { if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil {
return fmt.Errorf("cannot lock campaign: %w", err) return fmt.Errorf("cannot lock campaign: %w", err)
} }
@@ -205,7 +205,7 @@ func (s *CampaignService) AddScopeSource(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, 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 { if err := lockCampaignForUpdate(ctx, conn, s.scope, req.CampaignID); err != nil {
return fmt.Errorf("cannot lock campaign: %w", err) return fmt.Errorf("cannot lock campaign: %w", err)
} }
@@ -253,7 +253,7 @@ func (s *CampaignService) RemoveScopeSource(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, 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 { if err := lockCampaignForUpdate(ctx, conn, s.scope, req.CampaignID); err != nil {
return fmt.Errorf("cannot lock campaign: %w", err) return fmt.Errorf("cannot lock campaign: %w", err)
} }
@@ -292,7 +292,7 @@ func (s *CampaignService) Start(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Tx) error {
if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil { if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil {
return fmt.Errorf("cannot lock campaign: %w", err) return fmt.Errorf("cannot lock campaign: %w", err)
} }
@@ -346,7 +346,7 @@ func (s *CampaignService) Close(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Tx) error {
if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil { if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil {
return fmt.Errorf("cannot lock campaign: %w", err) return fmt.Errorf("cannot lock campaign: %w", err)
} }
@@ -388,9 +388,9 @@ func (s *CampaignService) Close(
return campaign, nil 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} 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 fmt.Errorf("cannot lock campaign for update: %w", err)
} }
return nil return nil
@@ -398,7 +398,7 @@ func lockCampaignForUpdate(ctx context.Context, conn pg.Conn, scope coredata.Sco
func (s *CampaignService) enqueueSourceFetches( func (s *CampaignService) enqueueSourceFetches(
ctx context.Context, ctx context.Context,
conn pg.Conn, tx pg.Tx,
campaignID gid.GID, campaignID gid.GID,
sources coredata.AccessSources, sources coredata.AccessSources,
) error { ) error {
@@ -408,7 +408,7 @@ func (s *CampaignService) enqueueSourceFetches(
AccessReviewCampaignID: campaignID, AccessReviewCampaignID: campaignID,
AccessSourceID: source.ID, 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) return fmt.Errorf("cannot queue source fetch %s: %w", source.ID, err)
} }
} }
@@ -424,7 +424,7 @@ func (s *CampaignService) Cancel(
err := s.pg.WithTx( err := s.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Tx) error {
if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil { if err := lockCampaignForUpdate(ctx, conn, s.scope, campaignID); err != nil {
return fmt.Errorf("cannot lock campaign: %w", err) return fmt.Errorf("cannot lock campaign: %w", err)
} }
@@ -466,7 +466,7 @@ func (s *CampaignService) ListForOrganizationID(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, 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 { if err := campaigns.LoadByOrganizationID(ctx, conn, s.scope, organizationID, cursor); err != nil {
return fmt.Errorf("cannot load campaigns by organization: %w", err) return fmt.Errorf("cannot load campaigns by organization: %w", err)
} }
@@ -488,7 +488,7 @@ func (s *CampaignService) ListSourceFetches(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, 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 { if err := fetches.LoadByCampaignID(ctx, conn, s.scope, campaignID); err != nil {
return fmt.Errorf("cannot load source fetches by campaign: %w", err) return fmt.Errorf("cannot load source fetches by campaign: %w", err)
} }
@@ -510,7 +510,7 @@ func (s *CampaignService) CountForOrganizationID(
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) (err error) { func(ctx context.Context, conn pg.Querier) (err error) {
campaigns := coredata.AccessReviewCampaigns{} campaigns := coredata.AccessReviewCampaigns{}
count, err = campaigns.CountByOrganizationID(ctx, conn, s.scope, organizationID) count, err = campaigns.CountByOrganizationID(ctx, conn, s.scope, organizationID)
if err != nil { if err != nil {

2
pkg/accessreview/drivers/probo_memberships.go
View File

@@ -49,7 +49,7 @@ func (d *ProboMembershipsDriver) ListAccounts(ctx context.Context) ([]AccountRec
err := d.pg.WithConn( err := d.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
accounts, err := coredata.LoadMembershipAccountsByOrganizationID( accounts, err := coredata.LoadMembershipAccountsByOrganizationID(
ctx, ctx,
conn, conn,

20
pkg/accessreview/review_engine.go
View File

@@ -73,11 +73,11 @@ func (e *ReviewEngine) FetchSource(
baseline []coredata.BaselineAccountEntry baseline []coredata.BaselineAccountEntry
) )
err := e.pg.WithConn( err := e.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
source = &coredata.AccessSource{} 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) return fmt.Errorf("cannot load access source %s: %w", sourceID, err)
} }
if source.OrganizationID != campaign.OrganizationID { if source.OrganizationID != campaign.OrganizationID {
@@ -85,19 +85,19 @@ func (e *ReviewEngine) FetchSource(
} }
var err error var err error
driver, err = e.resolveDriver(ctx, conn, source) driver, err = e.resolveDriver(ctx, tx, source)
if err != nil { if err != nil {
return fmt.Errorf("cannot resolve driver for source %s: %w", source.Name, err) return fmt.Errorf("cannot resolve driver for source %s: %w", source.Name, err)
} }
lastCompletedCampaign := &coredata.AccessReviewCampaign{} 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) { if !errors.Is(err, coredata.ErrResourceNotFound) {
return fmt.Errorf("cannot load last completed campaign: %w", err) return fmt.Errorf("cannot load last completed campaign: %w", err)
} }
} else { } else {
entries := &coredata.AccessEntries{} 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 { if err != nil {
return fmt.Errorf("cannot load baseline entries by source: %w", err) return fmt.Errorf("cannot load baseline entries by source: %w", err)
} }
@@ -125,7 +125,7 @@ func (e *ReviewEngine) FetchSource(
err = e.pg.WithTx( err = e.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Tx) error {
now := time.Now() now := time.Now()
seenAccountKeys := make(map[string]struct{}, len(accounts)) seenAccountKeys := make(map[string]struct{}, len(accounts))
@@ -252,7 +252,7 @@ func (e *ReviewEngine) connectorHTTPClient(
// connector_id (null = built-in, set = connector-backed). // connector_id (null = built-in, set = connector-backed).
func (e *ReviewEngine) resolveDriver( func (e *ReviewEngine) resolveDriver(
ctx context.Context, ctx context.Context,
conn pg.Conn, tx pg.Tx,
source *coredata.AccessSource, source *coredata.AccessSource,
) (drivers.Driver, error) { ) (drivers.Driver, error) {
if source.ConnectorID == nil { if source.ConnectorID == nil {
@@ -267,7 +267,7 @@ func (e *ReviewEngine) resolveDriver(
// Connector-backed: look up the connector and resolve driver by provider // Connector-backed: look up the connector and resolve driver by provider
dbConnector := &coredata.Connector{} 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) 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, ok := dbConnector.Connection.(*connector.OAuth2Connection); ok {
if oauth2Conn.AccessToken != tokenBefore { if oauth2Conn.AccessToken != tokenBefore {
dbConnector.UpdatedAt = time.Now() 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) return nil, fmt.Errorf("cannot persist refreshed token for connector %s: %w", *source.ConnectorID, err)
} }
} }

2
pkg/accessreview/service.go
View File

@@ -116,7 +116,7 @@ func (s *Service) ResolveEntryOrganizationID(ctx context.Context, entryID gid.GI
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
var err error var err error
entry := &coredata.AccessEntry{} entry := &coredata.AccessEntry{}
organizationID, err = entry.LoadOrganizationID(ctx, conn, entryID) organizationID, err = entry.LoadOrganizationID(ctx, conn, entryID)

12
pkg/accessreview/source_name_worker.go
View File

@@ -83,7 +83,7 @@ func (w *SourceNameWorker) processNext(ctx context.Context) error {
err := w.pg.WithTx( err := w.pg.WithTx(
ctx, ctx,
func(tx pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
return source.LoadNextUnsyncedNameForUpdateSkipLocked(ctx, tx) return source.LoadNextUnsyncedNameForUpdateSkipLocked(ctx, tx)
}, },
) )
@@ -101,15 +101,15 @@ func (w *SourceNameWorker) processNext(ctx context.Context) error {
resolver drivers.NameResolver resolver drivers.NameResolver
) )
err = w.pg.WithConn( err = w.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
scope := coredata.NewScopeFromObjectID(source.ID) scope := coredata.NewScopeFromObjectID(source.ID)
if source.ConnectorID == nil { if source.ConnectorID == nil {
return fmt.Errorf("source %s has no connector", source.ID) 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) 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, ok := dbConnector.Connection.(*connector.OAuth2Connection); ok {
if oauth2Conn.AccessToken != tokenBefore { if oauth2Conn.AccessToken != tokenBefore {
dbConnector.UpdatedAt = time.Now() 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) return fmt.Errorf("cannot persist refreshed token for connector %s: %w", *source.ConnectorID, err)
} }
} }
@@ -192,7 +192,7 @@ func (w *SourceNameWorker) markNameSynced(
) error { ) error {
return w.pg.WithTx( return w.pg.WithTx(
ctx, ctx,
func(tx pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
scope := coredata.NewScopeFromObjectID(source.ID) scope := coredata.NewScopeFromObjectID(source.ID)
now := time.Now() now := time.Now()

18
pkg/accessreview/worker.go
View File

@@ -127,7 +127,7 @@ func (w *SourceFetchWorker) processNext(
if err := w.pg.WithTx( if err := w.pg.WithTx(
nonCancelableCtx, nonCancelableCtx,
func(tx pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
if err := sourceFetch.LoadNextQueuedForUpdateSkipLocked(nonCancelableCtx, tx); err != nil { if err := sourceFetch.LoadNextQueuedForUpdateSkipLocked(nonCancelableCtx, tx); err != nil {
return err // sentinel errors checked by caller return err // sentinel errors checked by caller
} }
@@ -212,7 +212,7 @@ func (w *SourceFetchWorker) recoverStaleRows(ctx context.Context) {
err := w.pg.WithTx( err := w.pg.WithTx(
ctx, ctx,
func(tx pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
var fetches coredata.AccessReviewCampaignSourceFetches var fetches coredata.AccessReviewCampaignSourceFetches
count, err := fetches.RecoverStale(ctx, tx, staleThreshold, now) count, err := fetches.RecoverStale(ctx, tx, staleThreshold, now)
if err != nil { if err != nil {
@@ -251,10 +251,10 @@ func (w *SourceFetchWorker) commitFailedSourceFetch(
sourceFetch.CompletedAt = new(now) sourceFetch.CompletedAt = new(now)
sourceFetch.UpdatedAt = now sourceFetch.UpdatedAt = now
return w.pg.WithConn( return w.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
return sourceFetch.Update(ctx, conn, scope) return sourceFetch.Update(ctx, tx, scope)
}, },
) )
} }
@@ -275,10 +275,10 @@ func (w *SourceFetchWorker) commitSuccessfulSourceFetch(
sourceFetch.CompletedAt = new(now) sourceFetch.CompletedAt = new(now)
sourceFetch.UpdatedAt = now sourceFetch.UpdatedAt = now
return w.pg.WithConn( return w.pg.WithTx(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
return sourceFetch.Update(ctx, conn, scope) return sourceFetch.Update(ctx, tx, scope)
}, },
) )
} }
@@ -292,7 +292,7 @@ func (w *SourceFetchWorker) finalizeCampaignFetchLifecycle(
return w.pg.WithTx( return w.pg.WithTx(
ctx, ctx,
func(tx pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
if err := lockCampaignForUpdate(ctx, tx, scope, campaignID); err != nil { if err := lockCampaignForUpdate(ctx, tx, scope, campaignID); err != nil {
return fmt.Errorf("cannot lock campaign: %w", err) return fmt.Errorf("cannot lock campaign: %w", err)
} }

2
pkg/certmanager/acme_challenge_handler.go
View File

@@ -76,7 +76,7 @@ func (h *ACMEChallengeHandler) getKeyAuthForToken(ctx context.Context, token str
err := h.pg.WithConn( err := h.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
domain := &coredata.CustomDomain{} domain := &coredata.CustomDomain{}
if err := domain.LoadByHTTPChallengeToken(ctx, conn, coredata.NewNoScope(), token); err != nil { if err := domain.LoadByHTTPChallengeToken(ctx, conn, coredata.NewNoScope(), token); err != nil {
return err return err

4
pkg/certmanager/cache_store.go
View File

@@ -51,7 +51,7 @@ func (w *CacheStore) WarmCache(ctx context.Context) error {
err := w.pg.WithConn( err := w.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
domains := coredata.CustomDomains{} domains := coredata.CustomDomains{}
if err := domains.LoadActiveCertificates(ctx, conn, coredata.NewNoScope()); err != nil { if err := domains.LoadActiveCertificates(ctx, conn, coredata.NewNoScope()); err != nil {
return fmt.Errorf("cannot load active certificates: %w", err) return fmt.Errorf("cannot load active certificates: %w", err)
@@ -93,7 +93,7 @@ func (w *CacheStore) WarmCache(ctx context.Context) error {
return nil 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 var loadedDomain coredata.CustomDomain
if err := loadedDomain.LoadByID(ctx, conn, coredata.NewNoScope(), domain.ID); err != nil { if err := loadedDomain.LoadByID(ctx, conn, coredata.NewNoScope(), domain.ID); err != nil {
return fmt.Errorf("cannot load domain with decrypted values: %w", err) return fmt.Errorf("cannot load domain with decrypted values: %w", err)

10
pkg/certmanager/provisioner.go
View File

@@ -189,7 +189,7 @@ func (p *Provisioner) checkCAARecords(domain string) error {
func (p *Provisioner) checkPendingDomains(ctx context.Context) error { func (p *Provisioner) checkPendingDomains(ctx context.Context) error {
err := p.pg.WithTx( err := p.pg.WithTx(
ctx, ctx,
func(tx pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
if err := p.handleStaleProvisioningAttempts(ctx, tx); err != nil { if err := p.handleStaleProvisioningAttempts(ctx, tx); err != nil {
return fmt.Errorf("cannot handle stale provisioning attempts: %w", err) 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( err = p.pg.WithTx(
ctx, ctx,
func(tx pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
var domains coredata.CustomDomains var domains coredata.CustomDomains
if err := domains.ListDomainsWithPendingHTTPChallenges(ctx, tx, coredata.NewNoScope()); err != nil { if err := domains.ListDomainsWithPendingHTTPChallenges(ctx, tx, coredata.NewNoScope()); err != nil {
return fmt.Errorf("cannot load domains with pending challenges: %w", err) 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 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 var domains coredata.CustomDomains
if err := domains.ListStaleProvisioningDomains(ctx, tx, coredata.NewNoScope()); err != nil { if err := domains.ListStaleProvisioningDomains(ctx, tx, coredata.NewNoScope()); err != nil {
return fmt.Errorf("cannot load stale provisioning domains: %w", err) 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( func (p *Provisioner) resetStaleDomain(
ctx context.Context, ctx context.Context,
tx pg.Conn, tx pg.Tx,
domain *coredata.CustomDomain, domain *coredata.CustomDomain,
) error { ) error {
fullDomain := &coredata.CustomDomain{} fullDomain := &coredata.CustomDomain{}
@@ -320,7 +320,7 @@ func (p *Provisioner) resetStaleDomain(
func (p *Provisioner) provisionDomainCertificate( func (p *Provisioner) provisionDomainCertificate(
ctx context.Context, ctx context.Context,
tx pg.Conn, tx pg.Tx,
domainID gid.GID, domainID gid.GID,
) error { ) error {
domain := &coredata.CustomDomain{} domain := &coredata.CustomDomain{}

4
pkg/certmanager/renewer.go
View File

@@ -76,7 +76,7 @@ func (r *Renewer) Run(ctx context.Context) error {
func (r *Renewer) checkAndRenew(ctx context.Context) error { func (r *Renewer) checkAndRenew(ctx context.Context) error {
return r.pg.WithTx( return r.pg.WithTx(
ctx, ctx,
func(tx pg.Conn) error { func(ctx context.Context, tx pg.Tx) error {
var caches coredata.CachedCertificates var caches coredata.CachedCertificates
cacheCount, err := caches.CountAll(ctx, tx) cacheCount, err := caches.CountAll(ctx, tx)
if err != nil { 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{} domain := &coredata.CustomDomain{}
if err := domain.LoadByIDForUpdateSkipLocked(ctx, tx, coredata.NewNoScope(), domainID); err != nil { if err := domain.LoadByIDForUpdateSkipLocked(ctx, tx, coredata.NewNoScope(), domainID); err != nil {
if errors.Is(err, coredata.ErrResourceNotFound) { if errors.Is(err, coredata.ErrResourceNotFound) {

4
pkg/certmanager/selector.go
View File

@@ -80,7 +80,7 @@ func (s *Selector) loadFromDatabase(domain string) (*tls.Certificate, error) {
var cert *tls.Certificate var cert *tls.Certificate
err := s.pg.WithConn( err := s.pg.WithConn(
ctx, ctx,
func(conn pg.Conn) error { func(ctx context.Context, conn pg.Querier) error {
var cache coredata.CachedCertificate var cache coredata.CachedCertificate
if err := cache.LoadByDomain(ctx, conn, domain); err != nil { if err := cache.LoadByDomain(ctx, conn, domain); err != nil {
if err := s.rebuildCacheEntry(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 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 var customDomain coredata.CustomDomain
if err := customDomain.LoadByDomain(ctx, conn, coredata.NewNoScope(), domain); err != nil { if err := customDomain.LoadByDomain(ctx, conn, coredata.NewNoScope(), domain); err != nil {
return fmt.Errorf("cannot load domain: %w", err) return fmt.Errorf("cannot load domain: %w", err)

28
pkg/coredata/access_entry.go
View File

@@ -69,7 +69,7 @@ func (e AccessEntry) CursorKey(orderBy AccessEntryOrderField) page.CursorKey {
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM access_entries WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -85,7 +85,7 @@ func (e *AccessEntry) AuthorizationAttributes(ctx context.Context, conn pg.Conn)
func (e *AccessEntry) LoadByID( func (e *AccessEntry) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -149,7 +149,7 @@ LIMIT 1;
func (e *AccessEntry) Insert( func (e *AccessEntry) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -253,7 +253,7 @@ VALUES (
func (e *AccessEntry) Update( func (e *AccessEntry) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -298,7 +298,7 @@ WHERE
func (entries *AccessEntries) LoadByCampaignID( func (entries *AccessEntries) LoadByCampaignID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
campaignID gid.GID, campaignID gid.GID,
cursor *page.Cursor[AccessEntryOrderField], cursor *page.Cursor[AccessEntryOrderField],
@@ -364,7 +364,7 @@ WHERE
func (entries *AccessEntries) LoadByCampaignIDAndSourceID( func (entries *AccessEntries) LoadByCampaignIDAndSourceID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
campaignID gid.GID, campaignID gid.GID,
sourceID gid.GID, sourceID gid.GID,
@@ -432,7 +432,7 @@ WHERE
func (entries *AccessEntries) CountByCampaignID( func (entries *AccessEntries) CountByCampaignID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
campaignID gid.GID, campaignID gid.GID,
filter *AccessEntryFilter, filter *AccessEntryFilter,
@@ -461,7 +461,7 @@ WHERE
func (entries *AccessEntries) CountByCampaignIDAndSourceID( func (entries *AccessEntries) CountByCampaignIDAndSourceID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
campaignID gid.GID, campaignID gid.GID,
sourceID gid.GID, sourceID gid.GID,
@@ -492,7 +492,7 @@ WHERE
func (entries *AccessEntries) CountPendingByCampaignID( func (entries *AccessEntries) CountPendingByCampaignID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
campaignID gid.GID, campaignID gid.GID,
) (int, error) { ) (int, error) {
@@ -519,7 +519,7 @@ WHERE
func (e *AccessEntry) LoadOrganizationID( func (e *AccessEntry) LoadOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
entryID gid.GID, entryID gid.GID,
) (gid.GID, error) { ) (gid.GID, error) {
q := `SELECT organization_id FROM access_entries WHERE id = $1 LIMIT 1;` q := `SELECT organization_id FROM access_entries WHERE id = $1 LIMIT 1;`
@@ -537,7 +537,7 @@ func (e *AccessEntry) LoadOrganizationID(
func (e *AccessEntry) UpdateFlags( func (e *AccessEntry) UpdateFlags(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -574,7 +574,7 @@ WHERE
func (e *AccessEntry) Upsert( func (e *AccessEntry) Upsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -698,7 +698,7 @@ type BaselineAccountEntry struct {
func (entries *AccessEntries) LoadBaselineBySourceID( func (entries *AccessEntries) LoadBaselineBySourceID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
campaignID gid.GID, campaignID gid.GID,
sourceID gid.GID, sourceID gid.GID,
@@ -751,7 +751,7 @@ type MembershipAccount struct {
func LoadMembershipAccountsByOrganizationID( func LoadMembershipAccountsByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) ([]MembershipAccount, error) { ) ([]MembershipAccount, error) {

6
pkg/coredata/access_entry_decision_history.go
View File

@@ -43,7 +43,7 @@ type (
func (h *AccessEntryDecisionHistory) Insert( func (h *AccessEntryDecisionHistory) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -91,7 +91,7 @@ INSERT INTO access_entry_decision_history (
func (h *AccessEntryDecisionHistory) AuthorizationAttributes( func (h *AccessEntryDecisionHistory) AuthorizationAttributes(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
) (map[string]string, error) { ) (map[string]string, error) {
q := `SELECT organization_id FROM access_entry_decision_history WHERE id = $1 LIMIT 1;` 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( func (hs *AccessEntryDecisionHistories) LoadByEntryID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
entryID gid.GID, entryID gid.GID,
) error { ) error {

4
pkg/coredata/access_entry_statistics.go
View File

@@ -33,7 +33,7 @@ type AccessEntryStatistics struct {
func (s *AccessEntryStatistics) LoadByCampaignID( func (s *AccessEntryStatistics) LoadByCampaignID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
campaignID gid.GID, campaignID gid.GID,
) error { ) error {
@@ -135,7 +135,7 @@ GROUP BY incremental_tag;
func (s *AccessEntryStatistics) LoadByCampaignIDAndSourceID( func (s *AccessEntryStatistics) LoadByCampaignIDAndSourceID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
campaignID gid.GID, campaignID gid.GID,
sourceID gid.GID, sourceID gid.GID,

16
pkg/coredata/access_review_campaign.go
View File

@@ -53,7 +53,7 @@ func (c AccessReviewCampaign) CursorKey(orderBy AccessReviewCampaignOrderField)
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM access_review_campaigns WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -69,7 +69,7 @@ func (c *AccessReviewCampaign) AuthorizationAttributes(ctx context.Context, conn
func (c *AccessReviewCampaign) LoadByID( func (c *AccessReviewCampaign) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -117,7 +117,7 @@ LIMIT 1;
func (c *AccessReviewCampaign) Insert( func (c *AccessReviewCampaign) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -173,7 +173,7 @@ VALUES (
func (c *AccessReviewCampaign) Update( func (c *AccessReviewCampaign) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -218,7 +218,7 @@ WHERE
func (c *AccessReviewCampaign) Delete( func (c *AccessReviewCampaign) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -244,7 +244,7 @@ WHERE %s AND id = @id
func (campaigns *AccessReviewCampaigns) LoadByOrganizationID( func (campaigns *AccessReviewCampaigns) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[AccessReviewCampaignOrderField], cursor *page.Cursor[AccessReviewCampaignOrderField],
@@ -291,7 +291,7 @@ WHERE
func (campaigns *AccessReviewCampaigns) CountByOrganizationID( func (campaigns *AccessReviewCampaigns) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) (int, error) { ) (int, error) {
@@ -317,7 +317,7 @@ WHERE
func (c *AccessReviewCampaign) LoadLastCompletedByOrganizationID( func (c *AccessReviewCampaign) LoadLastCompletedByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {

12
pkg/coredata/access_review_campaign_scope_system.go
View File

@@ -33,7 +33,7 @@ type AccessReviewCampaignScopeSystem struct {
func (ss AccessReviewCampaignScopeSystem) Insert( func (ss AccessReviewCampaignScopeSystem) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -56,7 +56,7 @@ VALUES (@access_review_campaign_id, @access_source_id, @tenant_id)
func (ss AccessReviewCampaignScopeSystem) Upsert( func (ss AccessReviewCampaignScopeSystem) Upsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -80,7 +80,7 @@ ON CONFLICT (access_review_campaign_id, access_source_id) DO NOTHING
func (ss AccessReviewCampaignScopeSystem) Delete( func (ss AccessReviewCampaignScopeSystem) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -108,7 +108,7 @@ WHERE
func (c *AccessReviewCampaign) LockForUpdate( func (c *AccessReviewCampaign) LockForUpdate(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -135,7 +135,7 @@ FOR UPDATE
func (f *AccessReviewCampaignSourceFetch) UpsertQueued( func (f *AccessReviewCampaignSourceFetch) UpsertQueued(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
now time.Time, now time.Time,
) error { ) error {
@@ -184,7 +184,7 @@ ON CONFLICT (access_review_campaign_id, access_source_id) DO UPDATE SET
// all stale fetches regardless of tenant. // all stale fetches regardless of tenant.
func (fs *AccessReviewCampaignSourceFetches) RecoverStale( func (fs *AccessReviewCampaignSourceFetches) RecoverStale(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
staleThreshold time.Time, staleThreshold time.Time,
now time.Time, now time.Time,
) (int64, error) { ) (int64, error) {

10
pkg/coredata/access_review_campaign_source_fetch.go
View File

@@ -54,7 +54,7 @@ var (
func (f *AccessReviewCampaignSourceFetch) Insert( func (f *AccessReviewCampaignSourceFetch) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -107,7 +107,7 @@ INSERT INTO access_review_campaign_source_fetches (
func (f *AccessReviewCampaignSourceFetch) Update( func (f *AccessReviewCampaignSourceFetch) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -154,7 +154,7 @@ WHERE
func (f *AccessReviewCampaignSourceFetch) LoadByID( func (f *AccessReviewCampaignSourceFetch) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
campaignID gid.GID, campaignID gid.GID,
sourceID gid.GID, sourceID gid.GID,
@@ -207,7 +207,7 @@ LIMIT 1
func (fs *AccessReviewCampaignSourceFetches) LoadByCampaignID( func (fs *AccessReviewCampaignSourceFetches) LoadByCampaignID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
campaignID gid.GID, campaignID gid.GID,
) error { ) error {
@@ -258,7 +258,7 @@ ORDER BY created_at ASC
// Scope for subsequent operations. // Scope for subsequent operations.
func (f *AccessReviewCampaignSourceFetch) LoadNextQueuedForUpdateSkipLocked( func (f *AccessReviewCampaignSourceFetch) LoadNextQueuedForUpdateSkipLocked(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
SELECT SELECT

18
pkg/coredata/access_source.go
View File

@@ -52,7 +52,7 @@ func (as AccessSource) CursorKey(orderBy AccessSourceOrderField) page.CursorKey
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM access_sources WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -68,7 +68,7 @@ func (as *AccessSource) AuthorizationAttributes(ctx context.Context, conn pg.Con
func (as *AccessSource) LoadByID( func (as *AccessSource) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -115,7 +115,7 @@ LIMIT 1;
func (as *AccessSource) Insert( func (as *AccessSource) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -168,7 +168,7 @@ VALUES (
func (as *AccessSource) Update( func (as *AccessSource) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -211,7 +211,7 @@ WHERE
func (as *AccessSource) Delete( func (as *AccessSource) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -237,7 +237,7 @@ WHERE %s AND id = @id
func (sources *AccessSources) LoadByOrganizationID( func (sources *AccessSources) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[AccessSourceOrderField], cursor *page.Cursor[AccessSourceOrderField],
@@ -283,7 +283,7 @@ WHERE
func (sources *AccessSources) CountByOrganizationID( func (sources *AccessSources) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) (int, error) { ) (int, error) {
@@ -311,7 +311,7 @@ WHERE
// name order. Only explicitly scoped sources are returned. // name order. Only explicitly scoped sources are returned.
func (sources *AccessSources) LoadScopeSourcesByCampaignID( func (sources *AccessSources) LoadScopeSourcesByCampaignID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
campaignID gid.GID, campaignID gid.GID,
) error { ) 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. // FOR UPDATE SKIP LOCKED so concurrent workers do not pick the same row.
func (as *AccessSource) LoadNextUnsyncedNameForUpdateSkipLocked( func (as *AccessSource) LoadNextUnsyncedNameForUpdateSkipLocked(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
SELECT SELECT

22
pkg/coredata/applicability_statement.go
View File

@@ -58,7 +58,7 @@ func (s ApplicabilityStatement) CursorKey(orderBy ApplicabilityStatementOrderFie
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM applicability_statements WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -74,7 +74,7 @@ func (s *ApplicabilityStatement) AuthorizationAttributes(ctx context.Context, co
func (sac *ApplicabilityStatement) LoadByID( func (sac *ApplicabilityStatement) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -144,7 +144,7 @@ LIMIT 1;
func (sac *ApplicabilityStatement) LoadByStateOfApplicabilityIDAndControlID( func (sac *ApplicabilityStatement) LoadByStateOfApplicabilityIDAndControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
stateOfApplicabilityID gid.GID, stateOfApplicabilityID gid.GID,
controlID gid.GID, controlID gid.GID,
@@ -208,7 +208,7 @@ LIMIT 1;
func (sac *ApplicabilityStatement) Insert( func (sac *ApplicabilityStatement) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -269,7 +269,7 @@ VALUES (
func (sac *ApplicabilityStatement) Update( func (sac *ApplicabilityStatement) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -304,7 +304,7 @@ WHERE
func (sac *ApplicabilityStatement) UpdateByID( func (sac *ApplicabilityStatement) UpdateByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -341,7 +341,7 @@ WHERE
func (sac *ApplicabilityStatement) Delete( func (sac *ApplicabilityStatement) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -371,7 +371,7 @@ WHERE state_of_applicability_id IN (SELECT id FROM current_soa)
func (sac *ApplicabilityStatement) DeleteByID( func (sac *ApplicabilityStatement) DeleteByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
applicabilityStatementID gid.GID, applicabilityStatementID gid.GID,
) error { ) error {
@@ -400,7 +400,7 @@ WHERE
func (sacs *ApplicabilityStatements) LoadByStateOfApplicabilityID( func (sacs *ApplicabilityStatements) LoadByStateOfApplicabilityID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
stateOfApplicabilityID gid.GID, stateOfApplicabilityID gid.GID,
cursor *page.Cursor[ApplicabilityStatementOrderField], cursor *page.Cursor[ApplicabilityStatementOrderField],
@@ -469,7 +469,7 @@ WHERE
func (sacs *ApplicabilityStatements) CountByStateOfApplicabilityID( func (sacs *ApplicabilityStatements) CountByStateOfApplicabilityID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
stateOfApplicabilityID gid.GID, stateOfApplicabilityID gid.GID,
) (int, error) { ) (int, error) {
@@ -497,7 +497,7 @@ WHERE
func (sacs *ApplicabilityStatements) LoadByControlID( func (sacs *ApplicabilityStatements) LoadByControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
cursor *page.Cursor[ApplicabilityStatementOrderField], cursor *page.Cursor[ApplicabilityStatementOrderField],

20
pkg/coredata/asset.go
View File

@@ -57,7 +57,7 @@ func (a *Asset) CursorKey(field AssetOrderField) page.CursorKey {
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM assets WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -73,7 +73,7 @@ func (a *Asset) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[
func (a *Asset) LoadByID( func (a *Asset) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
assetID gid.GID, assetID gid.GID,
) error { ) error {
@@ -124,7 +124,7 @@ LIMIT 1;
func (a *Asset) LoadByOwnerID( func (a *Asset) LoadByOwnerID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -174,7 +174,7 @@ LIMIT 1;
func (a *Assets) CountByOrganizationID( func (a *Assets) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *AssetFilter, filter *AssetFilter,
@@ -208,7 +208,7 @@ WHERE
func (a *Assets) LoadByOrganizationID( func (a *Assets) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[AssetOrderField], cursor *page.Cursor[AssetOrderField],
@@ -260,7 +260,7 @@ WHERE
func (a *Asset) Insert( func (a *Asset) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -312,7 +312,7 @@ INSERT INTO assets (
func (a *Asset) Update( func (a *Asset) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -372,7 +372,7 @@ RETURNING
func (a *Asset) Delete( func (a *Asset) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -396,7 +396,7 @@ WHERE
return nil 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{}} snapshotters := []AssetSnapshotter{Assets{}, Vendors{}, AssetVendors{}}
for _, snapshotter := range snapshotters { 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( func (assets Assets) InsertAssetSnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

8
pkg/coredata/asset_vendor.go
View File

@@ -37,13 +37,13 @@ type (
AssetVendors []*AssetVendor AssetVendors []*AssetVendor
AssetSnapshotter interface { 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( func (av AssetVendors) Merge(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
assetID gid.GID, assetID gid.GID,
organizationID gid.GID, organizationID gid.GID,
@@ -89,7 +89,7 @@ WHEN NOT MATCHED
func (av AssetVendors) Insert( func (av AssetVendors) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
assetID gid.GID, assetID gid.GID,
organizationID gid.GID, organizationID gid.GID,
@@ -127,7 +127,7 @@ FROM vendor_ids
func (av AssetVendors) InsertAssetSnapshots( func (av AssetVendors) InsertAssetSnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

26
pkg/coredata/audit.go
View File

@@ -61,7 +61,7 @@ func (a *Audit) CursorKey(field AuditOrderField) page.CursorKey {
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM audits WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -77,7 +77,7 @@ func (a *Audit) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[
func (a *Audit) LoadByID( func (a *Audit) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
auditID gid.GID, auditID gid.GID,
) error { ) error {
@@ -128,7 +128,7 @@ LIMIT 1;
func (a *Audits) CountByOrganizationID( func (a *Audits) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) (int, error) { ) (int, error) {
@@ -160,7 +160,7 @@ WHERE
func (a *Audits) LoadByOrganizationID( func (a *Audits) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[AuditOrderField], cursor *page.Cursor[AuditOrderField],
@@ -212,7 +212,7 @@ WHERE
func (a *Audits) LoadAllByOrganizationID( func (a *Audits) LoadAllByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *AuditFilter, filter *AuditFilter,
@@ -262,7 +262,7 @@ ORDER BY valid_from DESC
func (a *Audit) Insert( func (a *Audit) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -320,7 +320,7 @@ INSERT INTO audits (
func (a *Audit) Update( func (a *Audit) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -362,7 +362,7 @@ WHERE
func (a *Audit) Delete( func (a *Audit) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -387,7 +387,7 @@ WHERE
func (a *Audits) LoadByControlID( func (a *Audits) LoadByControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
cursor *page.Cursor[AuditOrderField], cursor *page.Cursor[AuditOrderField],
@@ -454,7 +454,7 @@ WHERE %s
func (a *Audits) LoadByFindingID( func (a *Audits) LoadByFindingID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
findingID gid.GID, findingID gid.GID,
cursor *page.Cursor[AuditOrderField], cursor *page.Cursor[AuditOrderField],
@@ -521,7 +521,7 @@ WHERE %s
func (a *Audits) CountByControlID( func (a *Audits) CountByControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
) (int, error) { ) (int, error) {
@@ -563,7 +563,7 @@ WHERE
func (a *Audits) CountByFindingID( func (a *Audits) CountByFindingID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
findingID gid.GID, findingID gid.GID,
) (int, error) { ) (int, error) {
@@ -605,7 +605,7 @@ WHERE
func (a *Audit) LoadByReportID( func (a *Audit) LoadByReportID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
reportID gid.GID, reportID gid.GID,
) error { ) error {

10
pkg/coredata/audit_log_entry.go
View File

@@ -53,7 +53,7 @@ func (e AuditLogEntry) CursorKey(orderBy AuditLogEntryOrderField) page.CursorKey
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM audit_log_entries WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -69,7 +69,7 @@ func (e *AuditLogEntry) AuthorizationAttributes(ctx context.Context, conn pg.Con
func (e *AuditLogEntry) Insert( func (e *AuditLogEntry) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -122,7 +122,7 @@ VALUES (
func (e *AuditLogEntry) LoadByID( func (e *AuditLogEntry) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -168,7 +168,7 @@ LIMIT 1;
func (es *AuditLogEntries) LoadAllByOrganizationID( func (es *AuditLogEntries) LoadAllByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[AuditLogEntryOrderField], cursor *page.Cursor[AuditLogEntryOrderField],
@@ -216,7 +216,7 @@ WHERE
func (es *AuditLogEntries) CountByOrganizationID( func (es *AuditLogEntries) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *AuditLogEntryFilter, filter *AuditLogEntryFilter,

12
pkg/coredata/cached_certificate.go
View File

@@ -39,7 +39,7 @@ type (
CachedCertificates []*CachedCertificate 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 := ` q := `
SELECT SELECT
domain, domain,
@@ -72,7 +72,7 @@ LIMIT 1
return nil 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() cc.CachedAt = time.Now()
q := ` q := `
@@ -120,7 +120,7 @@ ON CONFLICT (domain) DO UPDATE SET
return nil 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` q := `DELETE FROM cached_certificates WHERE domain = @domain`
args := pgx.NamedArgs{"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 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` q := `SELECT COUNT(*) FROM cached_certificates`
var count int var count int
@@ -144,7 +144,7 @@ func (cc *CachedCertificates) CountAll(ctx context.Context, conn pg.Conn) (int,
return count, nil 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 := ` q := `
DELETE DELETE
FROM FROM
@@ -161,7 +161,7 @@ WHERE
return nil 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 { if domain.SSLCertificate == nil {
return fmt.Errorf("domain has no parsed certificate") return fmt.Errorf("domain has no parsed certificate")
} }

14
pkg/coredata/compliance_external_url.go
View File

@@ -52,7 +52,7 @@ func (c ComplianceExternalURL) CursorKey(orderBy ComplianceExternalURLOrderField
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM compliance_external_urls WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -68,7 +68,7 @@ func (c *ComplianceExternalURL) AuthorizationAttributes(ctx context.Context, con
func (c *ComplianceExternalURL) LoadByID( func (c *ComplianceExternalURL) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -114,7 +114,7 @@ LIMIT 1;
func (c *ComplianceExternalURL) Insert( func (c *ComplianceExternalURL) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -164,7 +164,7 @@ RETURNING rank;
func (c *ComplianceExternalURL) Update( func (c *ComplianceExternalURL) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -197,7 +197,7 @@ WHERE
func (c *ComplianceExternalURL) UpdateRank( func (c *ComplianceExternalURL) UpdateRank(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -248,7 +248,7 @@ WHERE %s
func (c *ComplianceExternalURL) Delete( func (c *ComplianceExternalURL) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -273,7 +273,7 @@ WHERE
func (c *ComplianceExternalURLs) LoadByTrustCenterID( func (c *ComplianceExternalURLs) LoadByTrustCenterID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterID gid.GID, trustCenterID gid.GID,
cursor *page.Cursor[ComplianceExternalURLOrderField], cursor *page.Cursor[ComplianceExternalURLOrderField],

16
pkg/coredata/compliance_framework.go
View File

@@ -55,7 +55,7 @@ func (c ComplianceFramework) CursorKey(orderBy ComplianceFrameworkOrderField) pa
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM compliance_frameworks WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -71,7 +71,7 @@ func (c *ComplianceFramework) AuthorizationAttributes(ctx context.Context, conn
func (c *ComplianceFramework) LoadByID( func (c *ComplianceFramework) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
complianceFrameworkID gid.GID, complianceFrameworkID gid.GID,
) error { ) error {
@@ -117,7 +117,7 @@ LIMIT 1;
func (c *ComplianceFramework) LoadByTrustCenterIDAndFrameworkID( func (c *ComplianceFramework) LoadByTrustCenterIDAndFrameworkID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterID gid.GID, trustCenterID gid.GID,
frameworkID gid.GID, frameworkID gid.GID,
@@ -168,7 +168,7 @@ LIMIT 1;
func (c *ComplianceFramework) Insert( func (c *ComplianceFramework) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -222,7 +222,7 @@ RETURNING rank;
func (c *ComplianceFramework) UpdateRank( func (c *ComplianceFramework) UpdateRank(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -272,7 +272,7 @@ WHERE %s
func (c *ComplianceFramework) Delete( func (c *ComplianceFramework) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -297,7 +297,7 @@ WHERE
func (c *ComplianceFrameworks) LoadByTrustCenterID( func (c *ComplianceFrameworks) LoadByTrustCenterID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterID gid.GID, trustCenterID gid.GID,
cursor *page.Cursor[ComplianceFrameworkOrderField], cursor *page.Cursor[ComplianceFrameworkOrderField],
@@ -342,7 +342,7 @@ WHERE
func (c *ComplianceFrameworks) LoadWithHiddenByTrustCenterID( func (c *ComplianceFrameworks) LoadWithHiddenByTrustCenterID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterID gid.GID, trustCenterID gid.GID,
cursor *page.Cursor[ComplianceFrameworkOrderField], cursor *page.Cursor[ComplianceFrameworkOrderField],

24
pkg/coredata/connector.go
View File

@@ -82,7 +82,7 @@ func (c *Connector) CursorKey(orderBy ConnectorOrderField) page.CursorKey {
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM connectors WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -98,7 +98,7 @@ func (c *Connector) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (
func (c *Connectors) LoadAllByOrganizationIDProtocolAndProvider( func (c *Connectors) LoadAllByOrganizationIDProtocolAndProvider(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
protocol ConnectorProtocol, protocol ConnectorProtocol,
@@ -118,7 +118,7 @@ func (c *Connectors) LoadAllByOrganizationIDProtocolAndProvider(
func (c *Connectors) LoadByOrganizationIDWithoutDecryptedConnection( func (c *Connectors) LoadByOrganizationIDWithoutDecryptedConnection(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[ConnectorOrderField], cursor *page.Cursor[ConnectorOrderField],
@@ -129,7 +129,7 @@ func (c *Connectors) LoadByOrganizationIDWithoutDecryptedConnection(
func (c *Connectors) LoadAllByOrganizationIDWithoutDecryptedConnection( func (c *Connectors) LoadAllByOrganizationIDWithoutDecryptedConnection(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {
@@ -138,7 +138,7 @@ func (c *Connectors) LoadAllByOrganizationIDWithoutDecryptedConnection(
func (c *Connector) LoadByID( func (c *Connector) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
connectorID gid.GID, connectorID gid.GID,
encryptionKey cipher.EncryptionKey, encryptionKey cipher.EncryptionKey,
@@ -175,7 +175,7 @@ func (c *Connector) LoadByID(
// Use this when you only need provider, organization, or other metadata. // Use this when you only need provider, organization, or other metadata.
func (c *Connector) LoadMetadataByID( func (c *Connector) LoadMetadataByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
connectorID gid.GID, connectorID gid.GID,
) error { ) error {
@@ -222,7 +222,7 @@ LIMIT 1;
func (c *Connector) Delete( func (c *Connector) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -248,7 +248,7 @@ WHERE %s AND id = @id
func (c *Connector) Insert( func (c *Connector) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
encryptionKey cipher.EncryptionKey, encryptionKey cipher.EncryptionKey,
) error { ) error {
@@ -328,7 +328,7 @@ INSERT INTO connectors (
func (c *Connectors) loadByOrganizationIDWithPagination( func (c *Connectors) loadByOrganizationIDWithPagination(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[ConnectorOrderField], cursor *page.Cursor[ConnectorOrderField],
@@ -377,7 +377,7 @@ WHERE
func (c *Connectors) loadAllByOrganizationID( func (c *Connectors) loadAllByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {
@@ -422,7 +422,7 @@ ORDER BY
func (c *Connectors) loadAllByOrganizationIDProtocolAndProvider( func (c *Connectors) loadAllByOrganizationIDProtocolAndProvider(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
protocol ConnectorProtocol, protocol ConnectorProtocol,
@@ -475,7 +475,7 @@ ORDER BY
func (c *Connector) Update( func (c *Connector) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
encryptionKey cipher.EncryptionKey, encryptionKey cipher.EncryptionKey,
) error { ) error {

40
pkg/coredata/control.go
View File

@@ -58,7 +58,7 @@ func (c Control) CursorKey(orderBy ControlOrderField) page.CursorKey {
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM controls WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -74,7 +74,7 @@ func (c *Control) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (ma
func (c *Controls) CountByDocumentID( func (c *Controls) CountByDocumentID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
filter *ControlFilter, filter *ControlFilter,
@@ -116,7 +116,7 @@ WHERE %s
func (c *Controls) LoadByDocumentID( func (c *Controls) LoadByDocumentID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
cursor *page.Cursor[ControlOrderField], cursor *page.Cursor[ControlOrderField],
@@ -187,7 +187,7 @@ WHERE %s
func (c *Controls) CountByMeasureID( func (c *Controls) CountByMeasureID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
measureID gid.GID, measureID gid.GID,
filter *ControlFilter, filter *ControlFilter,
@@ -229,7 +229,7 @@ WHERE %s
func (c *Controls) LoadByMeasureID( func (c *Controls) LoadByMeasureID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
measureID gid.GID, measureID gid.GID,
cursor *page.Cursor[ControlOrderField], cursor *page.Cursor[ControlOrderField],
@@ -300,7 +300,7 @@ WHERE %s
func (c *Controls) CountByRiskID( func (c *Controls) CountByRiskID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
filter *ControlFilter, filter *ControlFilter,
@@ -348,7 +348,7 @@ WHERE %s
func (c *Controls) LoadByRiskID( func (c *Controls) LoadByRiskID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
cursor *page.Cursor[ControlOrderField], cursor *page.Cursor[ControlOrderField],
@@ -425,7 +425,7 @@ WHERE %s
func (c *Controls) CountByFrameworkID( func (c *Controls) CountByFrameworkID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
frameworkID gid.GID, frameworkID gid.GID,
filter *ControlFilter, filter *ControlFilter,
@@ -457,7 +457,7 @@ WHERE %s
func (c *Controls) LoadByFrameworkID( func (c *Controls) LoadByFrameworkID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
frameworkID gid.GID, frameworkID gid.GID,
cursor *page.Cursor[ControlOrderField], cursor *page.Cursor[ControlOrderField],
@@ -508,7 +508,7 @@ WHERE
func (c *Controls) CountByOrganizationID( func (c *Controls) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *ControlFilter, filter *ControlFilter,
@@ -551,7 +551,7 @@ WHERE %s
func (c *Controls) LoadByOrganizationID( func (c *Controls) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[ControlOrderField], cursor *page.Cursor[ControlOrderField],
@@ -622,7 +622,7 @@ WHERE %s
func (c *Control) LoadByFrameworkIDAndSectionTitle( func (c *Control) LoadByFrameworkIDAndSectionTitle(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
frameworkID gid.GID, frameworkID gid.GID,
sectionTitle string, sectionTitle string,
@@ -673,7 +673,7 @@ LIMIT 1;
func (c *Control) LoadByID( func (c *Control) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
) error { ) error {
@@ -722,7 +722,7 @@ LIMIT 1;
func (c *Controls) LoadByIDs( func (c *Controls) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlIDs []gid.GID, controlIDs []gid.GID,
) error { ) error {
@@ -767,7 +767,7 @@ WHERE
func (c Control) Insert( func (c Control) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -833,7 +833,7 @@ VALUES (
func (c Control) Delete( func (c Control) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -855,7 +855,7 @@ WHERE
func (c *Control) Update( func (c *Control) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -901,7 +901,7 @@ WHERE %s
func (c *Controls) LoadByAuditID( func (c *Controls) LoadByAuditID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
auditID gid.GID, auditID gid.GID,
cursor *page.Cursor[ControlOrderField], cursor *page.Cursor[ControlOrderField],
@@ -972,7 +972,7 @@ WHERE %s
func (c *Controls) LoadBySnapshotID( func (c *Controls) LoadBySnapshotID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
snapshotID gid.GID, snapshotID gid.GID,
cursor *page.Cursor[ControlOrderField], cursor *page.Cursor[ControlOrderField],
@@ -1043,7 +1043,7 @@ WHERE %s
func (c *Controls) CountByStateOfApplicabilityID( func (c *Controls) CountByStateOfApplicabilityID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
stateOfApplicabilityID gid.GID, stateOfApplicabilityID gid.GID,
filter *ControlFilter, filter *ControlFilter,

4
pkg/coredata/control_audit.go
View File

@@ -38,7 +38,7 @@ type (
func (ca ControlAudit) Upsert( func (ca ControlAudit) Upsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -73,7 +73,7 @@ ON CONFLICT (control_id, audit_id) DO NOTHING;
func (ca ControlAudit) Delete( func (ca ControlAudit) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
auditID gid.GID, auditID gid.GID,

6
pkg/coredata/control_document.go
View File

@@ -41,7 +41,7 @@ type (
func (cp ControlDocument) Insert( func (cp ControlDocument) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -87,7 +87,7 @@ VALUES (
func (cp ControlDocument) Delete( func (cp ControlDocument) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
documentID gid.GID, documentID gid.GID,
@@ -116,7 +116,7 @@ WHERE
func (cp ControlDocument) DeleteByDocumentIDs( func (cp ControlDocument) DeleteByDocumentIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
documentIDs []gid.GID, documentIDs []gid.GID,
) error { ) error {

6
pkg/coredata/control_mesure.go
View File

@@ -39,7 +39,7 @@ type (
func (cm ControlMeasure) Upsert( func (cm ControlMeasure) Upsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -74,7 +74,7 @@ ON CONFLICT (control_id, measure_id) DO NOTHING;
func (cm ControlMeasure) Delete( func (cm ControlMeasure) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
measureID gid.GID, measureID gid.GID,
@@ -108,7 +108,7 @@ type ControlsWithRisk []*ControlWithRisk
func (cwrs *ControlsWithRisk) LoadByControlIDs( func (cwrs *ControlsWithRisk) LoadByControlIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlIDs []gid.GID, controlIDs []gid.GID,
) error { ) error {

6
pkg/coredata/control_obligation.go
View File

@@ -37,7 +37,7 @@ type (
func (co ControlObligation) Upsert( func (co ControlObligation) Upsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -69,7 +69,7 @@ ON CONFLICT (control_id, obligation_id) DO NOTHING;
func (co ControlObligation) Delete( func (co ControlObligation) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
obligationID gid.GID, obligationID gid.GID,
@@ -97,7 +97,7 @@ WHERE
func (cos *ControlObligations) CountByControlID( func (cos *ControlObligations) CountByControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
filter *ControlObligationFilter, filter *ControlObligationFilter,

4
pkg/coredata/control_snapshot.go
View File

@@ -38,7 +38,7 @@ type (
func (cs ControlSnapshot) Upsert( func (cs ControlSnapshot) Upsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -73,7 +73,7 @@ ON CONFLICT (control_id, snapshot_id) DO NOTHING;
func (cs ControlSnapshot) Delete( func (cs ControlSnapshot) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

26
pkg/coredata/custom_domain.go
View File

@@ -66,7 +66,7 @@ func NewCustomDomain(tenantID gid.TenantID, domain string) *CustomDomain {
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM custom_domains WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -151,7 +151,7 @@ func (cd *CustomDomain) ParseCertificate(encryptionKey cipher.EncryptionKey) err
func (cd *CustomDomain) LoadByID( func (cd *CustomDomain) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
domainID gid.GID, domainID gid.GID,
) error { ) error {
@@ -207,7 +207,7 @@ LIMIT 1
func (cd *CustomDomain) LoadByIDForUpdateSkipLocked( func (cd *CustomDomain) LoadByIDForUpdateSkipLocked(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
domainID gid.GID, domainID gid.GID,
) error { ) error {
@@ -263,7 +263,7 @@ FOR UPDATE SKIP LOCKED
func (cd *CustomDomain) LoadByDomain( func (cd *CustomDomain) LoadByDomain(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
domain string, domain string,
) error { ) error {
@@ -319,7 +319,7 @@ LIMIT 1
func (cd *CustomDomain) LoadByOrganizationID( func (cd *CustomDomain) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {
@@ -375,7 +375,7 @@ LIMIT 1
func (cd *CustomDomain) Insert( func (cd *CustomDomain) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
encryptionKey cipher.EncryptionKey, encryptionKey cipher.EncryptionKey,
) error { ) error {
@@ -462,7 +462,7 @@ INSERT INTO custom_domains (
func (cd *CustomDomain) Update( func (cd *CustomDomain) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
var encryptedKey []byte var encryptedKey []byte
@@ -522,7 +522,7 @@ WHERE
func (cd *CustomDomain) Delete( func (cd *CustomDomain) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -547,7 +547,7 @@ WHERE
func (cd *CustomDomain) LoadByHTTPChallengeToken( func (cd *CustomDomain) LoadByHTTPChallengeToken(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
token string, token string,
) error { ) error {
@@ -599,7 +599,7 @@ LIMIT 1
func (domains *CustomDomains) ListDomainsForRenewal( func (domains *CustomDomains) ListDomainsForRenewal(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -651,7 +651,7 @@ ORDER BY
func (domains *CustomDomains) ListDomainsWithPendingHTTPChallenges( func (domains *CustomDomains) ListDomainsWithPendingHTTPChallenges(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -706,7 +706,7 @@ WHERE
func (domains *CustomDomains) LoadActiveCertificates( func (domains *CustomDomains) LoadActiveCertificates(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -756,7 +756,7 @@ WHERE
func (domains *CustomDomains) ListStaleProvisioningDomains( func (domains *CustomDomains) ListStaleProvisioningDomains(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

20
pkg/coredata/data_protection_impact_assessment.go
View File

@@ -57,7 +57,7 @@ func (dpia *DataProtectionImpactAssessment) CursorKey(field DataProtectionImpact
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM processing_activity_data_protection_impact_assessments WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -73,7 +73,7 @@ func (dpia *DataProtectionImpactAssessment) AuthorizationAttributes(ctx context.
func (dpias *DataProtectionImpactAssessments) CountByOrganizationID( func (dpias *DataProtectionImpactAssessments) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *DataProtectionImpactAssessmentFilter, filter *DataProtectionImpactAssessmentFilter,
@@ -108,7 +108,7 @@ WHERE
func (dpias *DataProtectionImpactAssessments) LoadByOrganizationID( func (dpias *DataProtectionImpactAssessments) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[DataProtectionImpactAssessmentOrderField], cursor *page.Cursor[DataProtectionImpactAssessmentOrderField],
@@ -161,7 +161,7 @@ WHERE
func (dpias *DataProtectionImpactAssessments) LoadAllByOrganizationID( func (dpias *DataProtectionImpactAssessments) LoadAllByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *DataProtectionImpactAssessmentFilter, filter *DataProtectionImpactAssessmentFilter,
@@ -211,7 +211,7 @@ WHERE
func (dpia *DataProtectionImpactAssessment) LoadByID( func (dpia *DataProtectionImpactAssessment) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
dpiaID gid.GID, dpiaID gid.GID,
) error { ) error {
@@ -263,7 +263,7 @@ LIMIT 1;
func (dpia *DataProtectionImpactAssessment) LoadByProcessingActivityID( func (dpia *DataProtectionImpactAssessment) LoadByProcessingActivityID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
processingActivityID gid.GID, processingActivityID gid.GID,
) error { ) error {
@@ -315,7 +315,7 @@ LIMIT 1;
func (dpia *DataProtectionImpactAssessment) Insert( func (dpia *DataProtectionImpactAssessment) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -377,7 +377,7 @@ INSERT INTO processing_activity_data_protection_impact_assessments (
func (dpia *DataProtectionImpactAssessment) Update( func (dpia *DataProtectionImpactAssessment) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -416,7 +416,7 @@ WHERE
func (dpia *DataProtectionImpactAssessment) Delete( func (dpia *DataProtectionImpactAssessment) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -441,7 +441,7 @@ WHERE
func (dpias DataProtectionImpactAssessments) InsertProcessingActivitySnapshots( func (dpias DataProtectionImpactAssessments) InsertProcessingActivitySnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

22
pkg/coredata/datum.go
View File

@@ -43,7 +43,7 @@ type (
Data []*Datum Data []*Datum
DataSnapshotter interface { 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. // 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;` q := `SELECT organization_id FROM data WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -77,7 +77,7 @@ func (d *Datum) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[
func (d *Datum) LoadByID( func (d *Datum) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
dataID gid.GID, dataID gid.GID,
) error { ) error {
@@ -122,7 +122,7 @@ LIMIT 1;
func (d *Datum) LoadByOwnerID( func (d *Datum) LoadByOwnerID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -166,7 +166,7 @@ LIMIT 1;
func (d *Data) CountByOrganizationID( func (d *Data) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *DatumFilter, filter *DatumFilter,
@@ -201,7 +201,7 @@ WHERE
func (d *Data) LoadByOrganizationID( func (d *Data) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[DatumOrderField], cursor *page.Cursor[DatumOrderField],
@@ -251,7 +251,7 @@ WHERE
func (d *Datum) Insert( func (d *Datum) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -303,7 +303,7 @@ INSERT INTO data (
func (d *Datum) Update( func (d *Datum) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -357,7 +357,7 @@ RETURNING
func (d *Datum) Delete( func (d *Datum) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -381,7 +381,7 @@ WHERE
return nil 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{}} snapshotters := []DataSnapshotter{Data{}, Vendors{}, DatumVendors{}}
for _, snapshotter := range snapshotters { 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( func (d Data) InsertDataSnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

6
pkg/coredata/datum_vendor.go
View File

@@ -38,7 +38,7 @@ type (
func (dv DatumVendors) Merge( func (dv DatumVendors) Merge(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
datumID gid.GID, datumID gid.GID,
organizationID gid.GID, organizationID gid.GID,
@@ -84,7 +84,7 @@ WHEN NOT MATCHED BY SOURCE
func (dv DatumVendors) Insert( func (dv DatumVendors) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
datumID gid.GID, datumID gid.GID,
organizationID gid.GID, organizationID gid.GID,
@@ -122,7 +122,7 @@ FROM vendor_ids
func (d DatumVendors) InsertDataSnapshots( func (d DatumVendors) InsertDataSnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

42
pkg/coredata/document.go
View File

@@ -62,7 +62,7 @@ func (p Document) CursorKey(orderBy DocumentOrderField) page.CursorKey {
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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 := ` q := `
WITH document AS ( WITH document AS (
SELECT id, organization_id, status SELECT id, organization_id, status
@@ -119,7 +119,7 @@ LEFT JOIN last_quorum lq ON lq.document_id = document.id;
func (p *Document) LoadByID( func (p *Document) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
) error { ) error {
@@ -177,7 +177,7 @@ LIMIT 1;
func (p *Document) LoadByIDWithFilter( func (p *Document) LoadByIDWithFilter(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
filter *DocumentFilter, filter *DocumentFilter,
@@ -238,7 +238,7 @@ LIMIT 1;
func (p *Documents) LoadByIDs( func (p *Documents) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentIDs []gid.GID, documentIDs []gid.GID,
) error { ) error {
@@ -291,7 +291,7 @@ WHERE
func (p *Documents) CountByOrganizationID( func (p *Documents) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *DocumentFilter, filter *DocumentFilter,
@@ -325,7 +325,7 @@ WHERE
func (p *Documents) LoadByOrganizationID( func (p *Documents) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[DocumentOrderField], cursor *page.Cursor[DocumentOrderField],
@@ -384,7 +384,7 @@ WHERE
func (p *Documents) LoadAllByOrganizationID( func (p *Documents) LoadAllByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *DocumentFilter, filter *DocumentFilter,
@@ -441,7 +441,7 @@ ORDER BY title ASC
func (p *Documents) LoadPublishedByOrganizationID( func (p *Documents) LoadPublishedByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[DocumentOrderField], cursor *page.Cursor[DocumentOrderField],
@@ -511,7 +511,7 @@ WHERE
func (p Document) Insert( func (p Document) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -563,7 +563,7 @@ VALUES (
func (p Document) SoftDelete( func (p Document) SoftDelete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -581,7 +581,7 @@ UPDATE documents SET deleted_at = @deleted_at WHERE %s AND id = @document_id
func (p Document) DeleteByOrganizationID( func (p Document) DeleteByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {
@@ -600,7 +600,7 @@ DELETE FROM documents WHERE %s AND organization_id = @organization_id
func (p *Document) Update( func (p *Document) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -643,7 +643,7 @@ WHERE
func (p *Documents) CountByControlID( func (p *Documents) CountByControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
filter *DocumentFilter, filter *DocumentFilter,
@@ -679,7 +679,7 @@ WHERE cp.control_id = @control_id
func (p *Documents) LoadByControlID( func (p *Documents) LoadByControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
cursor *page.Cursor[DocumentOrderField], cursor *page.Cursor[DocumentOrderField],
@@ -740,7 +740,7 @@ WHERE cp.control_id = @control_id
func (p *Documents) CountByRiskID( func (p *Documents) CountByRiskID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
filter *DocumentFilter, filter *DocumentFilter,
@@ -776,7 +776,7 @@ WHERE rp.risk_id = @risk_id
func (p *Documents) LoadByRiskID( func (p *Documents) LoadByRiskID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
cursor *page.Cursor[DocumentOrderField], cursor *page.Cursor[DocumentOrderField],
@@ -837,7 +837,7 @@ WHERE rp.risk_id = @risk_id
func (p *Documents) BulkSoftDelete( func (p *Documents) BulkSoftDelete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -861,7 +861,7 @@ UPDATE documents SET deleted_at = @deleted_at WHERE %s AND id = ANY(@document_id
func (p *Documents) BulkArchive( func (p *Documents) BulkArchive(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -888,7 +888,7 @@ UPDATE documents SET status = 'ARCHIVED', archived_at = @archived_at, trust_cent
func (p *Documents) BulkUnarchive( func (p *Documents) BulkUnarchive(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -914,7 +914,7 @@ UPDATE documents SET status = 'ACTIVE', archived_at = NULL WHERE %s AND id = ANY
func (p *Document) IsLastSignableVersionSignedByUserEmail( func (p *Document) IsLastSignableVersionSignedByUserEmail(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
userEmail mail.Addr, userEmail mail.Addr,
@@ -975,7 +975,7 @@ SELECT EXISTS (
func (p *Document) GetViewerApprovalStateForLastVersion( func (p *Document) GetViewerApprovalStateForLastVersion(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
identityID gid.GID, identityID gid.GID,

20
pkg/coredata/document_version.go
View File

@@ -50,7 +50,7 @@ type (
) )
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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 := ` q := `
WITH document_version AS ( WITH document_version AS (
SELECT id, document_id, organization_id, status AS version_status 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( func (dv *DocumentVersions) LoadByDocumentID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
cursor *page.Cursor[DocumentVersionOrderField], cursor *page.Cursor[DocumentVersionOrderField],
@@ -171,7 +171,7 @@ func (dv DocumentVersion) CursorKey(orderBy DocumentVersionOrderField) page.Curs
func (dv *DocumentVersion) LoadByID( func (dv *DocumentVersion) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentVersionID gid.GID, documentVersionID gid.GID,
) error { ) error {
@@ -223,7 +223,7 @@ LIMIT 1;
func (dv DocumentVersion) Insert( func (dv DocumentVersion) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -295,7 +295,7 @@ VALUES (
func (dv *DocumentVersion) LoadByDocumentIDAndVersion( func (dv *DocumentVersion) LoadByDocumentIDAndVersion(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
major int, major int,
@@ -353,7 +353,7 @@ LIMIT 1;
func (dv *DocumentVersion) LoadLatestVersion( func (dv *DocumentVersion) LoadLatestVersion(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
) error { ) error {
@@ -405,7 +405,7 @@ LIMIT 1;
func (dv *DocumentVersion) LoadLatestPublishedVersion( func (dv *DocumentVersion) LoadLatestPublishedVersion(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
) error { ) error {
@@ -459,7 +459,7 @@ LIMIT 1;
func (dv DocumentVersion) Update( func (dv DocumentVersion) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -505,7 +505,7 @@ WHERE %s
func (dv DocumentVersion) Delete( func (dv DocumentVersion) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -531,7 +531,7 @@ WHERE %s
func (dv *DocumentVersions) CountByDocumentID( func (dv *DocumentVersions) CountByDocumentID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
filter *DocumentVersionFilter, filter *DocumentVersionFilter,

20
pkg/coredata/document_version_approval_decision.go
View File

@@ -54,7 +54,7 @@ func (d DocumentVersionApprovalDecision) CursorKey(orderBy DocumentVersionApprov
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM document_version_approval_decisions WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -70,7 +70,7 @@ func (d *DocumentVersionApprovalDecision) AuthorizationAttributes(ctx context.Co
func (d *DocumentVersionApprovalDecision) LoadByID( func (d *DocumentVersionApprovalDecision) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -118,7 +118,7 @@ WHERE
func (d *DocumentVersionApprovalDecision) LoadByQuorumIDAndApproverID( func (d *DocumentVersionApprovalDecision) LoadByQuorumIDAndApproverID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
quorumID gid.GID, quorumID gid.GID,
approverID gid.GID, approverID gid.GID,
@@ -172,7 +172,7 @@ LIMIT 1
func (d *DocumentVersionApprovalDecisions) CountApprovedByQuorumID( func (d *DocumentVersionApprovalDecisions) CountApprovedByQuorumID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
quorumID gid.GID, quorumID gid.GID,
) (int, error) { ) (int, error) {
@@ -203,7 +203,7 @@ WHERE
func (d *DocumentVersionApprovalDecisions) LoadByQuorumID( func (d *DocumentVersionApprovalDecisions) LoadByQuorumID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
quorumID gid.GID, quorumID gid.GID,
cursor *page.Cursor[DocumentVersionApprovalDecisionOrderField], cursor *page.Cursor[DocumentVersionApprovalDecisionOrderField],
@@ -254,7 +254,7 @@ WHERE
func (d *DocumentVersionApprovalDecision) Insert( func (d *DocumentVersionApprovalDecision) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -315,7 +315,7 @@ INSERT INTO document_version_approval_decisions (
func (ds DocumentVersionApprovalDecisions) BulkInsert( func (ds DocumentVersionApprovalDecisions) BulkInsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
if len(ds) == 0 { if len(ds) == 0 {
@@ -362,7 +362,7 @@ func (ds DocumentVersionApprovalDecisions) BulkInsert(
func (d *DocumentVersionApprovalDecision) Update( func (d *DocumentVersionApprovalDecision) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -401,7 +401,7 @@ WHERE
func (d *DocumentVersionApprovalDecision) Delete( func (d *DocumentVersionApprovalDecision) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -426,7 +426,7 @@ WHERE
func (d *DocumentVersionApprovalDecisions) CountByQuorumID( func (d *DocumentVersionApprovalDecisions) CountByQuorumID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
quorumID gid.GID, quorumID gid.GID,
filter *DocumentVersionApprovalDecisionFilter, filter *DocumentVersionApprovalDecisionFilter,

16
pkg/coredata/document_version_approval_quorum.go
View File

@@ -50,7 +50,7 @@ func (q DocumentVersionApprovalQuorum) CursorKey(orderBy DocumentVersionApproval
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` query := `SELECT organization_id FROM document_version_approval_quorums WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -66,7 +66,7 @@ func (q *DocumentVersionApprovalQuorum) AuthorizationAttributes(ctx context.Cont
func (q *DocumentVersionApprovalQuorum) LoadByID( func (q *DocumentVersionApprovalQuorum) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -110,7 +110,7 @@ WHERE
func (q *DocumentVersionApprovalQuorum) LoadLastByDocumentVersionID( func (q *DocumentVersionApprovalQuorum) LoadLastByDocumentVersionID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentVersionID gid.GID, documentVersionID gid.GID,
) error { ) error {
@@ -163,7 +163,7 @@ LIMIT 1
func (q *DocumentVersionApprovalQuorums) LoadAllByDocumentVersionID( func (q *DocumentVersionApprovalQuorums) LoadAllByDocumentVersionID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentVersionID gid.GID, documentVersionID gid.GID,
cursor *page.Cursor[DocumentVersionApprovalQuorumOrderField], cursor *page.Cursor[DocumentVersionApprovalQuorumOrderField],
@@ -214,7 +214,7 @@ WHERE
func (q *DocumentVersionApprovalQuorums) CountByDocumentVersionID( func (q *DocumentVersionApprovalQuorums) CountByDocumentVersionID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentVersionID gid.GID, documentVersionID gid.GID,
) (int, error) { ) (int, error) {
@@ -251,7 +251,7 @@ WHERE
func (q *DocumentVersionApprovalQuorum) Insert( func (q *DocumentVersionApprovalQuorum) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
query := ` query := `
@@ -300,7 +300,7 @@ INSERT INTO document_version_approval_quorums (
func (q *DocumentVersionApprovalQuorum) Delete( func (q *DocumentVersionApprovalQuorum) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
query := ` query := `
@@ -325,7 +325,7 @@ WHERE
func (q *DocumentVersionApprovalQuorum) Update( func (q *DocumentVersionApprovalQuorum) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
query := ` query := `

20
pkg/coredata/document_version_signature.go
View File

@@ -64,7 +64,7 @@ func (pvs DocumentVersionSignature) CursorKey(orderBy DocumentVersionSignatureOr
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM document_version_signatures WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -80,7 +80,7 @@ func (dvs *DocumentVersionSignature) AuthorizationAttributes(ctx context.Context
func (pvs *DocumentVersionSignature) LoadByDocumentVersionIDAndSignatory( func (pvs *DocumentVersionSignature) LoadByDocumentVersionIDAndSignatory(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentVersionID gid.GID, documentVersionID gid.GID,
signatory gid.GID, signatory gid.GID,
@@ -127,7 +127,7 @@ LIMIT 1
func (pvs *DocumentVersionSignature) LoadByID( func (pvs *DocumentVersionSignature) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
signatureID gid.GID, signatureID gid.GID,
) error { ) error {
@@ -171,7 +171,7 @@ WHERE
func (pvs DocumentVersionSignature) Insert( func (pvs DocumentVersionSignature) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -229,7 +229,7 @@ INSERT INTO document_version_signatures (
func (pvss *DocumentVersionSignatures) LoadByDocumentVersionID( func (pvss *DocumentVersionSignatures) LoadByDocumentVersionID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentVersionID gid.GID, documentVersionID gid.GID,
cursor *page.Cursor[DocumentVersionSignatureOrderField], cursor *page.Cursor[DocumentVersionSignatureOrderField],
@@ -286,7 +286,7 @@ WHERE
func (pvs *DocumentVersionSignature) Update( func (pvs *DocumentVersionSignature) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -323,7 +323,7 @@ WHERE
func (pvs *DocumentVersionSignature) Delete( func (pvs *DocumentVersionSignature) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
documentVersionSignatureID gid.GID, documentVersionSignatureID gid.GID,
) error { ) error {
@@ -349,7 +349,7 @@ WHERE
func (pvss *DocumentVersionSignaturesWithPeople) LoadByDocumentVersionIDWithPeople( func (pvss *DocumentVersionSignaturesWithPeople) LoadByDocumentVersionIDWithPeople(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentVersionID gid.GID, documentVersionID gid.GID,
limit int, limit int,
@@ -424,7 +424,7 @@ LIMIT @limit
func (pvs *DocumentVersionSignature) IsSignedByUserEmail( func (pvs *DocumentVersionSignature) IsSignedByUserEmail(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentVersionID gid.GID, documentVersionID gid.GID,
userEmail mail.Addr, userEmail mail.Addr,
@@ -476,7 +476,7 @@ SELECT EXISTS (
func (dvs *DocumentVersionSignatures) CountByDocumentVersionID( func (dvs *DocumentVersionSignatures) CountByDocumentVersionID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentVersionID gid.GID, documentVersionID gid.GID,
filter *DocumentVersionSignatureFilter, filter *DocumentVersionSignatureFilter,

14
pkg/coredata/electronic_signature.go
View File

@@ -79,7 +79,7 @@ func (es *ElectronicSignature) NewEvent(
func (es *ElectronicSignature) Insert( func (es *ElectronicSignature) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -120,7 +120,7 @@ INSERT INTO electronic_signatures (
func (es *ElectronicSignature) Update( func (es *ElectronicSignature) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -180,7 +180,7 @@ WHERE
func (es *ElectronicSignature) LoadByID( func (es *ElectronicSignature) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -220,7 +220,7 @@ LIMIT 1
func (es *ElectronicSignature) LoadNextAcceptedForUpdateSkipLocked( func (es *ElectronicSignature) LoadNextAcceptedForUpdateSkipLocked(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
SELECT SELECT
@@ -256,7 +256,7 @@ FOR UPDATE SKIP LOCKED
func (es *ElectronicSignature) LoadNextCompletedWithoutCertificateForUpdate( func (es *ElectronicSignature) LoadNextCompletedWithoutCertificateForUpdate(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
SELECT SELECT
@@ -295,7 +295,7 @@ FOR UPDATE SKIP LOCKED
func ResetStaleProcessingSignatures( func ResetStaleProcessingSignatures(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
staleAfter time.Duration, staleAfter time.Duration,
) error { ) error {
q := ` q := `
@@ -355,7 +355,7 @@ func (es *ElectronicSignature) computeSealV1() (string, error) {
func ResetStaleCertificateProcessing( func ResetStaleCertificateProcessing(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
staleAfter time.Duration, staleAfter time.Duration,
) error { ) error {
q := ` q := `

4
pkg/coredata/electronic_signature_event.go
View File

@@ -44,7 +44,7 @@ type (
func (e *ElectronicSignatureEvent) Insert( func (e *ElectronicSignatureEvent) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -81,7 +81,7 @@ INSERT INTO electronic_signature_events (
func (es *ElectronicSignatureEvents) LoadBySignatureID( func (es *ElectronicSignatureEvents) LoadBySignatureID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
sigID gid.GID, sigID gid.GID,
) error { ) error {

12
pkg/coredata/email.go
View File

@@ -65,7 +65,7 @@ var (
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // AuthorizationAttributes returns the authorization attributes for policy evaluation.
// Email is identity-scoped (not org-scoped), so it returns an empty map. // 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 return map[string]string{}, nil
} }
@@ -104,7 +104,7 @@ func NewEmail(
func (e *Email) Insert( func (e *Email) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
INSERT INTO emails ( INSERT INTO emails (
@@ -167,7 +167,7 @@ VALUES (
func (emails Emails) BulkInsert( func (emails Emails) BulkInsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
) error { ) error {
if len(emails) == 0 { if len(emails) == 0 {
return nil return nil
@@ -202,7 +202,7 @@ func (emails Emails) BulkInsert(
func (e *Email) LoadNextPendingForUpdateSkipLocked( func (e *Email) LoadNextPendingForUpdateSkipLocked(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
SELECT SELECT
@@ -237,7 +237,7 @@ FOR UPDATE SKIP LOCKED
func (e *Email) Update( func (e *Email) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
UPDATE emails UPDATE emails
@@ -269,7 +269,7 @@ WHERE id = @id
func ResetStaleProcessingEmails( func ResetStaleProcessingEmails(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
staleAfter time.Duration, staleAfter time.Duration,
) error { ) error {
q := ` q := `

4
pkg/coredata/email_attachment.go
View File

@@ -48,7 +48,7 @@ func NewEmailAttachment(emailID, fileID gid.GID, filename string) *EmailAttachme
func (a *EmailAttachment) Insert( func (a *EmailAttachment) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
INSERT INTO email_attachments (id, email_id, file_id, filename, created_at) 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( func (a *EmailAttachments) LoadByEmailID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
emailID gid.GID, emailID gid.GID,
) error { ) error {
q := ` q := `

24
pkg/coredata/evidence.go
View File

@@ -59,7 +59,7 @@ func (e Evidence) CursorKey(orderBy EvidenceOrderField) page.CursorKey {
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM evidences WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -75,7 +75,7 @@ func (e *Evidence) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (m
func (e Evidence) Upsert( func (e Evidence) Upsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -141,7 +141,7 @@ WHERE evidences.state = 'REQUESTED';
func (e Evidence) Insert( func (e Evidence) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -216,7 +216,7 @@ VALUES (
func (e *Evidence) LoadByID( func (e *Evidence) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
evidenceID gid.GID, evidenceID gid.GID,
) error { ) error {
@@ -266,7 +266,7 @@ LIMIT 1;
func (e *Evidences) CountByMeasureID( func (e *Evidences) CountByMeasureID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
measureID gid.GID, measureID gid.GID,
) (int, error) { ) (int, error) {
@@ -298,7 +298,7 @@ WHERE
func (e *Evidences) LoadByMeasureID( func (e *Evidences) LoadByMeasureID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
measureID gid.GID, measureID gid.GID,
cursor *page.Cursor[EvidenceOrderField], cursor *page.Cursor[EvidenceOrderField],
@@ -350,7 +350,7 @@ WHERE
func (e *Evidences) CountByTaskID( func (e *Evidences) CountByTaskID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
taskID gid.GID, taskID gid.GID,
) (int, error) { ) (int, error) {
@@ -382,7 +382,7 @@ WHERE
func (e *Evidences) LoadByTaskID( func (e *Evidences) LoadByTaskID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
taskID gid.GID, taskID gid.GID,
cursor *page.Cursor[EvidenceOrderField], cursor *page.Cursor[EvidenceOrderField],
@@ -434,7 +434,7 @@ WHERE
func (e Evidence) Update( func (e Evidence) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -475,7 +475,7 @@ WHERE
func (e Evidence) Delete( func (e Evidence) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -501,7 +501,7 @@ WHERE
func (e *Evidence) LoadNextPendingDescriptionForUpdateSkipLocked( func (e *Evidence) LoadNextPendingDescriptionForUpdateSkipLocked(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
SELECT SELECT
@@ -550,7 +550,7 @@ FOR UPDATE SKIP LOCKED;
func ResetStaleDescriptionProcessing( func ResetStaleDescriptionProcessing(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
staleAfter time.Duration, staleAfter time.Duration,
) error { ) error {
q := ` q := `

10
pkg/coredata/export_job.go
View File

@@ -63,7 +63,7 @@ var (
) )
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM export_jobs WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -79,7 +79,7 @@ func (ej *ExportJob) AuthorizationAttributes(ctx context.Context, conn pg.Conn)
func (ej *ExportJob) Insert( func (ej *ExportJob) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -121,7 +121,7 @@ INSERT INTO export_jobs (
func (ej *ExportJob) Update( func (ej *ExportJob) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -153,7 +153,7 @@ WHERE
func (ej *ExportJob) LoadByID( func (ej *ExportJob) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -197,7 +197,7 @@ WHERE
func (ej *ExportJob) LoadNextPendingForUpdateSkipLocked( func (ej *ExportJob) LoadNextPendingForUpdateSkipLocked(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
SELECT SELECT

12
pkg/coredata/file.go
View File

@@ -65,7 +65,7 @@ func (f *File) GetMimeType() string {
var _ filemanager.File = (*File)(nil) var _ filemanager.File = (*File)(nil)
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM files WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -81,7 +81,7 @@ func (f *File) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[s
func (f *File) LoadByID( func (f *File) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
fileID gid.GID, fileID gid.GID,
) error { ) error {
@@ -133,7 +133,7 @@ LIMIT 1;
func (f *Files) LoadByIDs( func (f *Files) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
fileIDs []gid.GID, fileIDs []gid.GID,
) error { ) error {
@@ -179,7 +179,7 @@ WHERE
func (f File) Insert( func (f File) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -245,7 +245,7 @@ VALUES (
func (f *File) LoadPublicByID( func (f *File) LoadPublicByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
fileID gid.GID, fileID gid.GID,
) error { ) error {
q := ` q := `
@@ -292,7 +292,7 @@ LIMIT 1;
return nil 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 := ` q := `
UPDATE files UPDATE files
SET deleted_at = NOW() SET deleted_at = NOW()

20
pkg/coredata/finding.go
View File

@@ -74,7 +74,7 @@ func (f *Finding) CursorKey(field FindingOrderField) page.CursorKey {
panic(fmt.Sprintf("unsupported order by: %s", field)) 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;` q := `SELECT organization_id FROM findings WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -90,7 +90,7 @@ func (f *Finding) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (ma
func (f *Finding) LoadByID( func (f *Finding) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
findingID gid.GID, findingID gid.GID,
) error { ) error {
@@ -145,7 +145,7 @@ LIMIT 1;
func (fs *Findings) CountByOrganizationID( func (fs *Findings) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *FindingFilter, filter *FindingFilter,
@@ -180,7 +180,7 @@ WHERE
func (fs *Findings) LoadByOrganizationID( func (fs *Findings) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[FindingOrderField], cursor *page.Cursor[FindingOrderField],
@@ -240,7 +240,7 @@ WHERE
func (f *Finding) Insert( func (f *Finding) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
lockQuery := `SELECT pg_advisory_xact_lock(hashtext(@organization_id::text))` lockQuery := `SELECT pg_advisory_xact_lock(hashtext(@organization_id::text))`
@@ -336,7 +336,7 @@ RETURNING reference_id
func (f *Finding) Update( func (f *Finding) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -389,7 +389,7 @@ WHERE
func (f *Finding) Delete( func (f *Finding) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -412,7 +412,7 @@ WHERE
return nil 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 := ` query := `
INSERT INTO findings ( INSERT INTO findings (
id, id,
@@ -503,7 +503,7 @@ WHERE %s AND live.organization_id = @organization_id
func (fs *Findings) LoadByAuditID( func (fs *Findings) LoadByAuditID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
auditID gid.GID, auditID gid.GID,
cursor *page.Cursor[FindingOrderField], cursor *page.Cursor[FindingOrderField],
@@ -589,7 +589,7 @@ WHERE %s
func (fs *Findings) CountByAuditID( func (fs *Findings) CountByAuditID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
auditID gid.GID, auditID gid.GID,
filter *FindingFilter, filter *FindingFilter,

4
pkg/coredata/finding_audit.go
View File

@@ -39,7 +39,7 @@ type (
func (fa FindingAudit) Upsert( func (fa FindingAudit) Upsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -81,7 +81,7 @@ ON CONFLICT (finding_id, audit_id) DO NOTHING;
func (fa FindingAudit) Delete( func (fa FindingAudit) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
findingID gid.GID, findingID gid.GID,
auditID gid.GID, auditID gid.GID,

18
pkg/coredata/framework.go
View File

@@ -54,7 +54,7 @@ func (f *Framework) CursorKey(orderBy FrameworkOrderField) page.CursorKey {
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM frameworks WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -70,7 +70,7 @@ func (f *Framework) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (
func (f *Frameworks) CountByOrganizationID( func (f *Frameworks) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) (int, error) { ) (int, error) {
@@ -101,7 +101,7 @@ WHERE
func (f *Frameworks) LoadByOrganizationID( func (f *Frameworks) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[FrameworkOrderField], cursor *page.Cursor[FrameworkOrderField],
@@ -147,7 +147,7 @@ WHERE
func (f *Framework) LoadByReferenceID( func (f *Framework) LoadByReferenceID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
referenceID string, referenceID string,
) error { ) error {
@@ -195,7 +195,7 @@ LIMIT 1;
func (f *Framework) LoadByID( func (f *Framework) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
frameworkID gid.GID, frameworkID gid.GID,
) error { ) error {
@@ -243,7 +243,7 @@ LIMIT 1;
func (f *Frameworks) LoadByIDs( func (f *Frameworks) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
frameworkIDs []gid.GID, frameworkIDs []gid.GID,
) error { ) error {
@@ -287,7 +287,7 @@ WHERE
func (f Framework) Insert( func (f Framework) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -348,7 +348,7 @@ VALUES (
func (f Framework) Delete( func (f Framework) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
frameworkID gid.GID, frameworkID gid.GID,
) error { ) error {
@@ -371,7 +371,7 @@ WHERE
func (f *Framework) Update( func (f *Framework) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

14
pkg/coredata/identity.go
View File

@@ -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. // Tenant id scope is not applied because we want to access identities across all tenants for authentication purposes.
func (i *Identity) LoadByEmail( func (i *Identity) LoadByEmail(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
email mail.Addr, email mail.Addr,
) error { ) error {
q := ` 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. // Tenant id scope is not applied because we want to access identities across all tenants for authentication purposes.
func (i *Identity) LoadByID( func (i *Identity) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
identityID gid.GID, identityID gid.GID,
) error { ) error {
q := ` q := `
@@ -143,7 +143,7 @@ LIMIT 1;
// AuthorizationAttributes loads the minimal authorization attributes for policy condition evaluation. // AuthorizationAttributes loads the minimal authorization attributes for policy condition evaluation.
// It is intentionally lightweight and does not populate the Identity struct. // 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 := ` q := `
SELECT SELECT
id, id,
@@ -173,7 +173,7 @@ WHERE
func (i *Identity) Insert( func (i *Identity) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
INSERT INTO INSERT INTO
@@ -217,7 +217,7 @@ VALUES (
return nil 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 := ` q := `
UPDATE UPDATE
identities identities
@@ -257,7 +257,7 @@ WHERE
// LoadBySAMLSubject loads an identity by their SAML subject (NameID) // LoadBySAMLSubject loads an identity by their SAML subject (NameID)
func (i *Identity) LoadBySAMLSubject( func (i *Identity) LoadBySAMLSubject(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
samlSubject string, samlSubject string,
) error { ) error {
q := ` q := `
@@ -300,7 +300,7 @@ LIMIT 1;
func (i *Identity) CountMemberships( func (i *Identity) CountMemberships(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
) (int, error) { ) (int, error) {
q := ` q := `
SELECT SELECT

14
pkg/coredata/invitation.go
View File

@@ -50,7 +50,7 @@ func (i Invitation) CursorKey(orderBy InvitationOrderField) page.CursorKey {
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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 := ` query := `
INSERT INTO INSERT INTO
iam_invitations ( iam_invitations (
@@ -90,7 +90,7 @@ VALUES (
func (i *Invitation) LoadByID( func (i *Invitation) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -141,7 +141,7 @@ WHERE
// AuthorizationAttributes loads the minimal authorization attributes for policy condition evaluation. // AuthorizationAttributes loads the minimal authorization attributes for policy condition evaluation.
// It is intentionally lightweight and does not populate the Invitation struct. // 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 := ` q := `
SELECT SELECT
email, organization_id email, organization_id
@@ -167,7 +167,7 @@ LIMIT 1;
}, nil }, 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 := ` query := `
UPDATE UPDATE
iam_invitations iam_invitations
@@ -198,7 +198,7 @@ WHERE
return nil 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 := ` query := `
DELETE FROM DELETE FROM
iam_invitations iam_invitations
@@ -228,7 +228,7 @@ WHERE
func (i *Invitations) LoadByUserID( func (i *Invitations) LoadByUserID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
userID gid.GID, userID gid.GID,
cursor *page.Cursor[InvitationOrderField], cursor *page.Cursor[InvitationOrderField],
@@ -281,7 +281,7 @@ WHERE
func (i *Invitations) ExpireByUserID( func (i *Invitations) ExpireByUserID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
userID gid.GID, userID gid.GID,
filter *InvitationFilter, filter *InvitationFilter,

8
pkg/coredata/mailing_list.go
View File

@@ -35,7 +35,7 @@ type MailingList struct {
UpdatedAt time.Time `db:"updated_at"` 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;` q := `SELECT organization_id FROM mailing_lists WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -51,7 +51,7 @@ func (ml *MailingList) AuthorizationAttributes(ctx context.Context, conn pg.Conn
func (ml *MailingList) LoadByID( func (ml *MailingList) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -95,7 +95,7 @@ LIMIT 1;
func (ml *MailingList) Update( func (ml *MailingList) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -131,7 +131,7 @@ WHERE
func (ml *MailingList) Insert( func (ml *MailingList) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

18
pkg/coredata/mailing_list_subscriber.go
View File

@@ -44,7 +44,7 @@ type (
MailingListSubscribers []*MailingListSubscriber 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;` q := `SELECT organization_id FROM mailing_list_subscribers WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -69,7 +69,7 @@ func (cns *MailingListSubscriber) CursorKey(orderBy MailingListSubscriberOrderFi
func (cns *MailingListSubscriber) LoadByID( func (cns *MailingListSubscriber) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
id gid.GID, id gid.GID,
) error { ) error {
@@ -119,7 +119,7 @@ LIMIT 1;
func (cns *MailingListSubscriber) LoadByMailingListIDAndEmail( func (cns *MailingListSubscriber) LoadByMailingListIDAndEmail(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
mailingListID gid.GID, mailingListID gid.GID,
email mail.Addr, email mail.Addr,
@@ -172,7 +172,7 @@ LIMIT 1;
func (cns *MailingListSubscriber) Insert( func (cns *MailingListSubscriber) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -225,7 +225,7 @@ VALUES (
func (cns *MailingListSubscriber) Update( func (cns *MailingListSubscriber) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -261,7 +261,7 @@ WHERE
func (cns *MailingListSubscriber) Delete( func (cns *MailingListSubscriber) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -291,7 +291,7 @@ WHERE
func (cnss *MailingListSubscribers) CountByMailingListID( func (cnss *MailingListSubscribers) CountByMailingListID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
mailingListID gid.GID, mailingListID gid.GID,
) (int, error) { ) (int, error) {
@@ -323,7 +323,7 @@ WHERE
func (cnss *MailingListSubscribers) LoadAllConfirmedByMailingListID( func (cnss *MailingListSubscribers) LoadAllConfirmedByMailingListID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
mailingListID gid.GID, mailingListID gid.GID,
) error { ) error {
@@ -367,7 +367,7 @@ WHERE
func (cnss *MailingListSubscribers) LoadByMailingListID( func (cnss *MailingListSubscribers) LoadByMailingListID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
mailingListID gid.GID, mailingListID gid.GID,
cursor *page.Cursor[MailingListSubscriberOrderField], cursor *page.Cursor[MailingListSubscriberOrderField],

20
pkg/coredata/mailing_list_update.go
View File

@@ -53,7 +53,7 @@ func (mlu *MailingListUpdate) CursorKey(orderBy MailingListUpdateOrderField) pag
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM mailing_list_updates WHERE id = $1 LIMIT 1;`
var organizationID gid.GID 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 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 := ` q := `
INSERT INTO mailing_list_updates ( INSERT INTO mailing_list_updates (
id, id,
@@ -107,7 +107,7 @@ INSERT INTO mailing_list_updates (
return err 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 := ` q := `
UPDATE mailing_list_updates UPDATE mailing_list_updates
SET SET
@@ -140,7 +140,7 @@ WHERE
return nil 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 := ` q := `
DELETE FROM mailing_list_updates DELETE FROM mailing_list_updates
WHERE WHERE
@@ -164,7 +164,7 @@ WHERE
return nil 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 := ` q := `
SELECT SELECT
id, id,
@@ -207,7 +207,7 @@ LIMIT 1;
func (mlul *MailingListUpdateItems) LoadSentByMailingListID( func (mlul *MailingListUpdateItems) LoadSentByMailingListID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
mailingListID gid.GID, mailingListID gid.GID,
cursor *page.Cursor[MailingListUpdateOrderField], cursor *page.Cursor[MailingListUpdateOrderField],
@@ -254,7 +254,7 @@ WHERE
func (mlul *MailingListUpdateItems) LoadByMailingListID( func (mlul *MailingListUpdateItems) LoadByMailingListID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
mailingListID gid.GID, mailingListID gid.GID,
cursor *page.Cursor[MailingListUpdateOrderField], cursor *page.Cursor[MailingListUpdateOrderField],
@@ -300,7 +300,7 @@ WHERE
func (mlul *MailingListUpdateItems) CountByMailingListID( func (mlul *MailingListUpdateItems) CountByMailingListID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
mailingListID gid.GID, mailingListID gid.GID,
) (int, error) { ) (int, error) {
@@ -329,7 +329,7 @@ WHERE
func (mlu *MailingListUpdate) LoadNextEnqueuedForUpdateSkipLocked( func (mlu *MailingListUpdate) LoadNextEnqueuedForUpdateSkipLocked(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
SELECT SELECT
@@ -367,7 +367,7 @@ FOR UPDATE SKIP LOCKED
func ResetStaleProcessingMailingListUpdates( func ResetStaleProcessingMailingListUpdates(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
staleAfter time.Duration, staleAfter time.Duration,
) error { ) error {
q := ` q := `

28
pkg/coredata/measure.go
View File

@@ -57,7 +57,7 @@ func (m Measure) CursorKey(orderBy MeasureOrderField) page.CursorKey {
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM measures WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -73,7 +73,7 @@ func (m *Measure) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (ma
func (m *Measures) CountByRiskID( func (m *Measures) CountByRiskID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
filter *MeasureFilter, filter *MeasureFilter,
@@ -118,7 +118,7 @@ WHERE %s
func (m *Measures) LoadByRiskID( func (m *Measures) LoadByRiskID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
cursor *page.Cursor[MeasureOrderField], cursor *page.Cursor[MeasureOrderField],
@@ -185,7 +185,7 @@ WHERE %s
func (m *Measures) CountByControlID( func (m *Measures) CountByControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
filter *MeasureFilter, filter *MeasureFilter,
@@ -230,7 +230,7 @@ WITH mtgtns AS (
func (m *Measures) LoadByControlID( func (m *Measures) LoadByControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
cursor *page.Cursor[MeasureOrderField], cursor *page.Cursor[MeasureOrderField],
@@ -297,7 +297,7 @@ WHERE %s
func (m *Measures) CountByOrganizationID( func (m *Measures) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *MeasureFilter, filter *MeasureFilter,
@@ -330,7 +330,7 @@ WHERE
func (m *Measures) LoadDistinctCategoriesByOrganizationID( func (m *Measures) LoadDistinctCategoriesByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) ([]string, error) { ) ([]string, error) {
@@ -365,7 +365,7 @@ ORDER BY
func (m *Measures) LoadByOrganizationID( func (m *Measures) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[MeasureOrderField], cursor *page.Cursor[MeasureOrderField],
@@ -414,7 +414,7 @@ WHERE
func (m *Measure) LoadByID( func (m *Measure) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
measureID gid.GID, measureID gid.GID,
) error { ) error {
@@ -463,7 +463,7 @@ LIMIT 1;
func (m *Measures) LoadByIDs( func (m *Measures) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
measureIDs []gid.GID, measureIDs []gid.GID,
) error { ) error {
@@ -507,7 +507,7 @@ WHERE
func (m *Measure) Upsert( func (m *Measure) Upsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -583,7 +583,7 @@ RETURNING
func (m Measure) Insert( func (m Measure) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -643,7 +643,7 @@ VALUES (
func (m *Measure) Update( func (m *Measure) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -676,7 +676,7 @@ WHERE %s
func (m *Measure) Delete( func (m *Measure) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
measureID gid.GID, measureID gid.GID,
) error { ) error {

14
pkg/coredata/meeting.go
View File

@@ -55,7 +55,7 @@ func (m Meeting) CursorKey(orderBy MeetingOrderField) page.CursorKey {
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM meetings WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -71,7 +71,7 @@ func (m *Meeting) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (ma
func (m *Meeting) LoadByID( func (m *Meeting) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
meetingID gid.GID, meetingID gid.GID,
) error { ) error {
@@ -117,7 +117,7 @@ LIMIT 1;
func (m *Meetings) LoadByOrganizationID( func (m *Meetings) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[MeetingOrderField], cursor *page.Cursor[MeetingOrderField],
@@ -160,7 +160,7 @@ WHERE
func (m *Meetings) CountByOrganizationID( func (m *Meetings) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) (int, error) { ) (int, error) {
@@ -191,7 +191,7 @@ WHERE
func (m *Meeting) Insert( func (m *Meeting) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -239,7 +239,7 @@ VALUES (
func (m *Meeting) Update( func (m *Meeting) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -278,7 +278,7 @@ WHERE %s
func (m *Meeting) Delete( func (m *Meeting) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

2
pkg/coredata/meeting_attendee.go
View File

@@ -37,7 +37,7 @@ type (
func (ma *MeetingAttendees) Merge( func (ma *MeetingAttendees) Merge(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
meetingID gid.GID, meetingID gid.GID,
organizationID gid.GID, organizationID gid.GID,

16
pkg/coredata/membership.go
View File

@@ -54,7 +54,7 @@ func (m Membership) CursorKey(orderBy MembershipOrderField) page.CursorKey {
func (m *Membership) LoadByIdentityIDAndOrganizationID( func (m *Membership) LoadByIdentityIDAndOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
identityID gid.GID, identityID gid.GID,
organizationID gid.GID, organizationID gid.GID,
@@ -102,7 +102,7 @@ WHERE
return nil 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 := ` query := `
INSERT INTO INSERT INTO
iam_memberships ( iam_memberships (
@@ -154,7 +154,7 @@ VALUES (
func (m *Membership) LoadByID( func (m *Membership) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
membershipID gid.GID, membershipID gid.GID,
) error { ) error {
@@ -198,7 +198,7 @@ WHERE
return nil 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 := ` q := `
SELECT SELECT
identity_id, identity_id,
@@ -234,7 +234,7 @@ LIMIT 1;
func (m *Membership) LoadByIdentityAndOrg( func (m *Membership) LoadByIdentityAndOrg(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
identityID gid.GID, identityID gid.GID,
organizationID gid.GID, organizationID gid.GID,
@@ -281,7 +281,7 @@ WHERE
return nil 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 := ` query := `
UPDATE UPDATE
iam_memberships iam_memberships
@@ -314,7 +314,7 @@ WHERE
return nil 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 := ` query := `
DELETE FROM DELETE FROM
iam_memberships iam_memberships
@@ -344,7 +344,7 @@ WHERE
func (m *Membership) LoadActiveByIdentityIDAndOrganizationID( func (m *Membership) LoadActiveByIdentityIDAndOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
identityID gid.GID, identityID gid.GID,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {

36
pkg/coredata/membership_profile.go
View File

@@ -87,7 +87,7 @@ func (p MembershipProfile) CursorKey(orderBy MembershipProfileOrderField) page.C
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id, identity_id FROM iam_membership_profiles WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -107,7 +107,7 @@ func (p *MembershipProfile) AuthorizationAttributes(ctx context.Context, conn pg
func (p *MembershipProfile) LoadByID( func (p *MembershipProfile) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
profileID gid.GID, profileID gid.GID,
) error { ) error {
@@ -183,7 +183,7 @@ LIMIT 1;
func (p *MembershipProfile) LoadByIdentityIDAndOrganizationID( func (p *MembershipProfile) LoadByIdentityIDAndOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
identityID gid.GID, identityID gid.GID,
organizationID gid.GID, organizationID gid.GID,
@@ -264,7 +264,7 @@ LIMIT 1;
func (p *MembershipProfiles) LoadByIDs( func (p *MembershipProfiles) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
profileIDs []gid.GID, profileIDs []gid.GID,
) error { ) error {
@@ -335,7 +335,7 @@ WHERE
func (p *MembershipProfiles) LoadByOrganizationID( func (p *MembershipProfiles) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[MembershipProfileOrderField], cursor *page.Cursor[MembershipProfileOrderField],
@@ -449,7 +449,7 @@ WHERE
func (p *MembershipProfiles) LoadByIdentityID( func (p *MembershipProfiles) LoadByIdentityID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
identityID gid.GID, identityID gid.GID,
cursor *page.Cursor[MembershipProfileOrderField], cursor *page.Cursor[MembershipProfileOrderField],
filter *MembershipProfileFilter, filter *MembershipProfileFilter,
@@ -561,7 +561,7 @@ WHERE
func (p *MembershipProfiles) LoadByDocumentVersionID( func (p *MembershipProfiles) LoadByDocumentVersionID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentVersionID gid.GID, documentVersionID gid.GID,
cursor *page.Cursor[MembershipProfileOrderField], cursor *page.Cursor[MembershipProfileOrderField],
@@ -682,7 +682,7 @@ INNER JOIN identities i ON i.id = p.identity_id
func (p *MembershipProfiles) CountByDocumentVersionID( func (p *MembershipProfiles) CountByDocumentVersionID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentVersionID gid.GID, documentVersionID gid.GID,
) (int, error) { ) (int, error) {
@@ -720,7 +720,7 @@ WHERE
func (p *MembershipProfiles) LoadByMeetingID( func (p *MembershipProfiles) LoadByMeetingID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
meetingID gid.GID, meetingID gid.GID,
) error { ) error {
@@ -836,7 +836,7 @@ ORDER BY
func (p *MembershipProfiles) LoadAwaitingSigning( func (p *MembershipProfiles) LoadAwaitingSigning(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -912,7 +912,7 @@ INNER JOIN signatories ON p.id = signatories.signed_by_profile_id
func (p *MembershipProfiles) CountByIdentityID( func (p *MembershipProfiles) CountByIdentityID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
identityID gid.GID, identityID gid.GID,
filter *MembershipProfileFilter, filter *MembershipProfileFilter,
) (int, error) { ) (int, error) {
@@ -945,7 +945,7 @@ WHERE
func (p *MembershipProfiles) CountByOrganizationID( func (p *MembershipProfiles) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *MembershipProfileFilter, filter *MembershipProfileFilter,
@@ -981,7 +981,7 @@ WHERE
func (p *MembershipProfiles) CountActiveOwnerByOrganizationID( func (p *MembershipProfiles) CountActiveOwnerByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) (int, error) { ) (int, error) {
@@ -1020,7 +1020,7 @@ WHERE
func (p *MembershipProfile) Insert( func (p *MembershipProfile) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
INSERT INTO INSERT INTO
@@ -1146,7 +1146,7 @@ VALUES (
func (p *MembershipProfile) Update( func (p *MembershipProfile) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -1235,7 +1235,7 @@ WHERE
func (p *MembershipProfiles) ResetSCIMSources( func (p *MembershipProfiles) ResetSCIMSources(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {
@@ -1269,7 +1269,7 @@ WHERE
func (p *MembershipProfile) ClearExternalID( func (p *MembershipProfile) ClearExternalID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
externalID string, externalID string,
organizationID gid.GID, organizationID gid.GID,
@@ -1305,7 +1305,7 @@ WHERE
func (p *MembershipProfile) Delete( func (p *MembershipProfile) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
profileID gid.GID, profileID gid.GID,
) error { ) error {

24
pkg/coredata/obligation.go
View File

@@ -65,7 +65,7 @@ func (o *Obligation) CursorKey(field ObligationOrderField) page.CursorKey {
panic(fmt.Sprintf("unsupported order by: %s", field)) 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;` q := `SELECT organization_id FROM obligations WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -81,7 +81,7 @@ func (o *Obligation) AuthorizationAttributes(ctx context.Context, conn pg.Conn)
func (o *Obligation) LoadByID( func (o *Obligation) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
obligationID gid.GID, obligationID gid.GID,
) error { ) error {
@@ -133,7 +133,7 @@ LIMIT 1;
func (os *Obligations) CountByOrganizationID( func (os *Obligations) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *ObligationFilter, filter *ObligationFilter,
@@ -168,7 +168,7 @@ WHERE
func (os *Obligations) CountByRiskID( func (os *Obligations) CountByRiskID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
filter *ObligationFilter, filter *ObligationFilter,
@@ -214,7 +214,7 @@ WHERE %s
func (os *Obligations) LoadByOrganizationID( func (os *Obligations) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[ObligationOrderField], cursor *page.Cursor[ObligationOrderField],
@@ -271,7 +271,7 @@ WHERE
func (os *Obligations) LoadByRiskID( func (os *Obligations) LoadByRiskID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
cursor *page.Cursor[ObligationOrderField], cursor *page.Cursor[ObligationOrderField],
@@ -353,7 +353,7 @@ WHERE %s
func (os *Obligations) CountByControlID( func (os *Obligations) CountByControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
filter *ObligationFilter, filter *ObligationFilter,
@@ -398,7 +398,7 @@ WHERE %s
func (os *Obligations) LoadByControlID( func (os *Obligations) LoadByControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
cursor *page.Cursor[ObligationOrderField], cursor *page.Cursor[ObligationOrderField],
@@ -478,7 +478,7 @@ WHERE %s
func (o *Obligation) Insert( func (o *Obligation) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -551,7 +551,7 @@ INSERT INTO obligations (
func (o *Obligation) Update( func (o *Obligation) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -601,7 +601,7 @@ WHERE
func (o *Obligation) Delete( func (o *Obligation) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -625,7 +625,7 @@ WHERE
return nil 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 := ` query := `
INSERT INTO obligations ( INSERT INTO obligations (
id, id,

8
pkg/coredata/oidc_state.go
View File

@@ -34,7 +34,7 @@ type OIDCState struct {
ExpiresAt time.Time `db:"expires_at"` 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 := ` query := `
INSERT INTO iam_oidc_states (id, provider, nonce, code_verifier, continue_url, created_at, expires_at) 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) 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 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 := ` query := `
SELECT id, provider, nonce, code_verifier, continue_url, created_at, expires_at SELECT id, provider, nonce, code_verifier, continue_url, created_at, expires_at
FROM iam_oidc_states FROM iam_oidc_states
@@ -83,7 +83,7 @@ FOR UPDATE
return nil 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` query := `DELETE FROM iam_oidc_states WHERE id = @id`
_, err := conn.Exec(ctx, query, pgx.StrictNamedArgs{"id": s.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 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` query := `DELETE FROM iam_oidc_states WHERE expires_at < @now`
result, err := conn.Exec(ctx, query, pgx.StrictNamedArgs{"now": now}) result, err := conn.Exec(ctx, query, pgx.StrictNamedArgs{"now": now})

16
pkg/coredata/organization.go
View File

@@ -46,7 +46,7 @@ type (
Organizations []*Organization 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;` q := `SELECT id FROM organizations WHERE id = $1 LIMIT 1;`
var id gid.GID var id gid.GID
@@ -75,7 +75,7 @@ func (o Organization) CursorKey(orderBy OrganizationOrderField) page.CursorKey {
func (o *Organization) LoadByID( func (o *Organization) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {
@@ -127,7 +127,7 @@ LIMIT 1;
func (o *Organizations) LoadByIDs( func (o *Organizations) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationIDs []gid.GID, organizationIDs []gid.GID,
) error { ) error {
@@ -174,7 +174,7 @@ WHERE
func (o *Organizations) LoadByIdentityID( func (o *Organizations) LoadByIdentityID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
identityID gid.GID, identityID gid.GID,
cursor *page.Cursor[OrganizationOrderField], cursor *page.Cursor[OrganizationOrderField],
@@ -232,7 +232,7 @@ WHERE
func (o *Organization) Insert( func (o *Organization) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
INSERT INTO organizations ( INSERT INTO organizations (
@@ -277,7 +277,7 @@ INSERT INTO organizations (
func (o *Organization) Update( func (o *Organization) Update(
ctx context.Context, ctx context.Context,
scope Scoper, scope Scoper,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
UPDATE organizations UPDATE organizations
@@ -323,7 +323,7 @@ WHERE
func (o *Organization) Delete( func (o *Organization) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {
q := ` q := `
@@ -343,7 +343,7 @@ WHERE id = @id
func (o *Organization) LoadByCustomDomainID( func (o *Organization) LoadByCustomDomainID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
customDomainID gid.GID, customDomainID gid.GID,
) error { ) error {

6
pkg/coredata/organization_context.go
View File

@@ -41,7 +41,7 @@ type (
func (oc *OrganizationContext) LoadByOrganizationID( func (oc *OrganizationContext) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {
@@ -89,7 +89,7 @@ LIMIT 1;
func (oc *OrganizationContext) Insert( func (oc *OrganizationContext) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -138,7 +138,7 @@ INSERT INTO organization_contexts (
func (oc *OrganizationContext) Update( func (oc *OrganizationContext) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

14
pkg/coredata/personal_api_key.go
View File

@@ -52,7 +52,7 @@ func (a *PersonalAPIKey) CursorKey(orderBy PersonalAPIKeyOrderField) page.Cursor
func (a *PersonalAPIKey) LoadByID( func (a *PersonalAPIKey) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
apiKeyID gid.GID, apiKeyID gid.GID,
) error { ) error {
q := ` q := `
@@ -93,7 +93,7 @@ LIMIT 1;
return nil 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;" q := "SELECT identity_id FROM iam_personal_api_keys WHERE id = $1 LIMIT 1;"
var identityID gid.GID var identityID gid.GID
@@ -109,7 +109,7 @@ func (a *PersonalAPIKey) AuthorizationAttributes(ctx context.Context, conn pg.Co
func (a *PersonalAPIKeys) LoadByIdentityID( func (a *PersonalAPIKeys) LoadByIdentityID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
identityID gid.GID, identityID gid.GID,
) error { ) error {
q := ` q := `
@@ -146,7 +146,7 @@ ORDER BY created_at DESC;
return nil 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 := ` q := `
SELECT SELECT
COUNT(*) COUNT(*)
@@ -169,7 +169,7 @@ ORDER BY created_at DESC;
func (a *PersonalAPIKey) Insert( func (a *PersonalAPIKey) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
INSERT INTO INSERT INTO
@@ -207,7 +207,7 @@ VALUES (
func (a *PersonalAPIKey) Update( func (a *PersonalAPIKey) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
UPDATE UPDATE
@@ -241,7 +241,7 @@ WHERE
func (a *PersonalAPIKey) Delete( func (a *PersonalAPIKey) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
DELETE FROM DELETE FROM

20
pkg/coredata/processing_activities.go
View File

@@ -70,7 +70,7 @@ func (p *ProcessingActivity) CursorKey(field ProcessingActivityOrderField) page.
panic(fmt.Sprintf("unsupported order by: %s", field)) 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;` q := `SELECT organization_id FROM processing_activities WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -86,7 +86,7 @@ func (p *ProcessingActivity) AuthorizationAttributes(ctx context.Context, conn p
func (p *ProcessingActivity) LoadByID( func (p *ProcessingActivity) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
processingActivityID gid.GID, processingActivityID gid.GID,
) error { ) error {
@@ -147,7 +147,7 @@ LIMIT 1;
func (p *ProcessingActivities) CountByOrganizationID( func (p *ProcessingActivities) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *ProcessingActivityFilter, filter *ProcessingActivityFilter,
@@ -182,7 +182,7 @@ WHERE
func (p *ProcessingActivities) LoadByOrganizationID( func (p *ProcessingActivities) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[ProcessingActivityOrderField], cursor *page.Cursor[ProcessingActivityOrderField],
@@ -248,7 +248,7 @@ WHERE
func (p *ProcessingActivities) LoadAllByOrganizationID( func (p *ProcessingActivities) LoadAllByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *ProcessingActivityFilter, filter *ProcessingActivityFilter,
@@ -312,7 +312,7 @@ ORDER BY created_at DESC
func (p *ProcessingActivity) Insert( func (p *ProcessingActivity) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -412,7 +412,7 @@ INSERT INTO processing_activities (
func (p *ProcessingActivity) Update( func (p *ProcessingActivity) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -481,7 +481,7 @@ WHERE
func (p *ProcessingActivity) Delete( func (p *ProcessingActivity) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -505,7 +505,7 @@ WHERE
return nil 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{}} snapshotters := []ProcessingActivitySnapshotter{ProcessingActivities{}, Vendors{}, ProcessingActivityVendors{}, DataProtectionImpactAssessments{}, TransferImpactAssessments{}}
for _, snapshotter := range snapshotters { for _, snapshotter := range snapshotters {
@@ -519,7 +519,7 @@ func (pas ProcessingActivities) Snapshot(ctx context.Context, conn pg.Conn, scop
func (pas ProcessingActivities) InsertProcessingActivitySnapshots( func (pas ProcessingActivities) InsertProcessingActivitySnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

8
pkg/coredata/processing_activity_vendor.go
View File

@@ -37,13 +37,13 @@ type (
ProcessingActivityVendors []*ProcessingActivityVendor ProcessingActivityVendors []*ProcessingActivityVendor
ProcessingActivitySnapshotter interface { 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( func (pav ProcessingActivityVendors) Merge(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
processingActivityID gid.GID, processingActivityID gid.GID,
organizationID gid.GID, organizationID gid.GID,
@@ -89,7 +89,7 @@ WHEN NOT MATCHED
func (pav ProcessingActivityVendors) Insert( func (pav ProcessingActivityVendors) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
processingActivityID gid.GID, processingActivityID gid.GID,
organizationID gid.GID, organizationID gid.GID,
@@ -127,7 +127,7 @@ FROM vendor_ids
func (pav ProcessingActivityVendors) InsertProcessingActivitySnapshots( func (pav ProcessingActivityVendors) InsertProcessingActivitySnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

12
pkg/coredata/report.go
View File

@@ -42,7 +42,7 @@ type (
Reports []*Report 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;` q := `SELECT organization_id FROM reports WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -58,7 +58,7 @@ func (r *Report) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map
func (r *Report) LoadByID( func (r *Report) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
reportID gid.GID, reportID gid.GID,
) error { ) error {
@@ -106,7 +106,7 @@ LIMIT 1;
func (r *Reports) LoadByIDs( func (r *Reports) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
reportIDs []gid.GID, reportIDs []gid.GID,
) error { ) error {
@@ -149,7 +149,7 @@ WHERE
func (r *Report) Insert( func (r *Report) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -198,7 +198,7 @@ INSERT INTO reports (
func (r *Report) Update( func (r *Report) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -236,7 +236,7 @@ WHERE
func (r *Report) Delete( func (r *Report) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

14
pkg/coredata/rights_requests.go
View File

@@ -61,7 +61,7 @@ func (rr *RightsRequest) CursorKey(field RightsRequestOrderField) page.CursorKey
} }
// AuthorizationAttributes returns the authorization attributes for policy evaluation. // 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;` q := `SELECT organization_id FROM rights_requests WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -77,7 +77,7 @@ func (rr *RightsRequest) AuthorizationAttributes(ctx context.Context, conn pg.Co
func (rr *RightsRequest) LoadByID( func (rr *RightsRequest) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
rightsRequestID gid.GID, rightsRequestID gid.GID,
) error { ) error {
@@ -128,7 +128,7 @@ LIMIT 1;
func (rrs *RightsRequests) CountByOrganizationID( func (rrs *RightsRequests) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) (int, error) { ) (int, error) {
@@ -160,7 +160,7 @@ WHERE
func (rrs *RightsRequests) LoadByOrganizationID( func (rrs *RightsRequests) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[RightsRequestOrderField], cursor *page.Cursor[RightsRequestOrderField],
@@ -209,7 +209,7 @@ WHERE
func (rr *RightsRequest) Insert( func (rr *RightsRequest) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -267,7 +267,7 @@ INSERT INTO rights_requests (
func (rr *RightsRequest) Update( func (rr *RightsRequest) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -310,7 +310,7 @@ WHERE
func (rr *RightsRequest) Delete( func (rr *RightsRequest) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

28
pkg/coredata/risk.go
View File

@@ -55,7 +55,7 @@ type (
Risks []*Risk Risks []*Risk
RiskSnapshotter interface { 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)) 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;` q := `SELECT organization_id FROM risks WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -96,7 +96,7 @@ func (r *Risk) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[s
func (r *Risks) CountByMeasureID( func (r *Risks) CountByMeasureID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
measureID gid.GID, measureID gid.GID,
filter *RiskFilter, filter *RiskFilter,
@@ -140,7 +140,7 @@ WHERE %s
func (r *Risks) LoadByMeasureID( func (r *Risks) LoadByMeasureID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
measureID gid.GID, measureID gid.GID,
cursor *page.Cursor[RiskOrderField], cursor *page.Cursor[RiskOrderField],
@@ -229,7 +229,7 @@ WHERE %s
func (r *Risks) CountByOrganizationID( func (r *Risks) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *RiskFilter, filter *RiskFilter,
@@ -260,7 +260,7 @@ WHERE %s
func (r *Risks) LoadByOrganizationID( func (r *Risks) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[RiskOrderField], cursor *page.Cursor[RiskOrderField],
@@ -347,7 +347,7 @@ WHERE %s
func (r *Risk) LoadByID( func (r *Risk) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
) error { ) error {
@@ -403,7 +403,7 @@ LIMIT 1;
func (r *Risks) LoadByIDs( func (r *Risks) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
riskIDs []gid.GID, riskIDs []gid.GID,
) error { ) error {
@@ -454,7 +454,7 @@ WHERE %s
func (r *Risk) Insert( func (r *Risk) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -486,7 +486,7 @@ VALUES (@id, @tenant_id, @organization_id, @name, @description, @category, @owne
func (r *Risk) Update( func (r *Risk) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -531,7 +531,7 @@ WHERE %s
func (r *Risk) Delete( func (r *Risk) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
) error { ) error {
@@ -549,7 +549,7 @@ DELETE FROM risks WHERE %s AND id = @id AND snapshot_id IS NULL
func (r *Risks) CountByDocumentID( func (r *Risks) CountByDocumentID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
documentID gid.GID, documentID gid.GID,
filter *RiskFilter, filter *RiskFilter,
@@ -591,7 +591,7 @@ WHERE %s
return count, nil 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 { if err := r.InsertRiskSnapshots(ctx, conn, scope, organizationID, snapshotID); err != nil {
return fmt.Errorf("cannot create risk snapshots: %w", err) 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( func (r Risks) InsertRiskSnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

6
pkg/coredata/risk_document.go
View File

@@ -39,7 +39,7 @@ type (
func (rp RiskDocument) Insert( func (rp RiskDocument) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -73,7 +73,7 @@ VALUES (
func (rp RiskDocument) Delete( func (rp RiskDocument) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
documentID gid.GID, documentID gid.GID,
@@ -102,7 +102,7 @@ WHERE
func (rp RiskDocument) DeleteByDocumentIDs( func (rp RiskDocument) DeleteByDocumentIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
documentIDs []gid.GID, documentIDs []gid.GID,
) error { ) error {

4
pkg/coredata/risk_mesure.go
View File

@@ -39,7 +39,7 @@ type (
func (rm RiskMeasure) Insert( func (rm RiskMeasure) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -73,7 +73,7 @@ VALUES (
func (rm RiskMeasure) Delete( func (rm RiskMeasure) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
riskID gid.GID, riskID gid.GID,
measureID gid.GID, measureID gid.GID,

4
pkg/coredata/risk_obligation.go
View File

@@ -38,7 +38,7 @@ type (
func (ro RiskObligation) Insert( func (ro RiskObligation) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -75,7 +75,7 @@ INSERT INTO risks_obligations (
func (ro RiskObligation) Delete( func (ro RiskObligation) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

4
pkg/coredata/saml_assertion.go
View File

@@ -35,7 +35,7 @@ type SAMLAssertion struct {
func (s *SAMLAssertion) Insert( func (s *SAMLAssertion) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
query := ` query := `
INSERT INTO iam_saml_assertions (id, organization_id, used_at, expires_at) 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 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 := ` query := `
DELETE FROM iam_saml_assertions DELETE FROM iam_saml_assertions
WHERE expires_at < @now WHERE expires_at < @now

24
pkg/coredata/saml_configuration.go
View File

@@ -63,7 +63,7 @@ func (s *SAMLConfiguration) CursorKey(orderBy SAMLConfigurationOrderField) page.
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM iam_saml_configurations WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -93,7 +93,7 @@ func (s *SAMLConfiguration) GetIdPCertificate() (*x509.Certificate, error) {
func (s *SAMLConfiguration) LoadByOrganizationIDAndEmailDomain( func (s *SAMLConfiguration) LoadByOrganizationIDAndEmailDomain(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
emailDomain string, emailDomain string,
@@ -155,7 +155,7 @@ LIMIT 1;
func (s *SAMLConfiguration) LoadByID( func (s *SAMLConfiguration) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
configID gid.GID, configID gid.GID,
) error { ) error {
@@ -212,7 +212,7 @@ LIMIT 1;
func (s *SAMLConfiguration) LoadByIDForUpdateSkipLocked( func (s *SAMLConfiguration) LoadByIDForUpdateSkipLocked(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
configID gid.GID, configID gid.GID,
) error { ) error {
q := ` q := `
@@ -264,7 +264,7 @@ FOR UPDATE SKIP LOCKED;
func (s *SAMLConfiguration) Insert( func (s *SAMLConfiguration) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -347,7 +347,7 @@ INSERT INTO iam_saml_configurations (
func (s *SAMLConfiguration) Update( func (s *SAMLConfiguration) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -402,7 +402,7 @@ WHERE
func (s *SAMLConfiguration) Delete( func (s *SAMLConfiguration) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -427,7 +427,7 @@ WHERE
func (s *SAMLConfigurations) LoadByOrganizationID( func (s *SAMLConfigurations) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {
@@ -480,7 +480,7 @@ ORDER BY email_domain ASC;
func (s *SAMLConfigurations) CountByOrganizationID( func (s *SAMLConfigurations) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) (int, error) { ) (int, error) {
@@ -513,7 +513,7 @@ WHERE
return count, nil 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 := ` q := `
SELECT SELECT
id, id,
@@ -558,7 +558,7 @@ ORDER BY email_domain ASC;
func (s *SAMLConfigurations) CountVerifiedByEmailDomain( func (s *SAMLConfigurations) CountVerifiedByEmailDomain(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
emailDomain string, emailDomain string,
) (int, error) { ) (int, error) {
q := ` q := `
@@ -582,7 +582,7 @@ WHERE
func (s *SAMLConfigurations) LoadUnverified( func (s *SAMLConfigurations) LoadUnverified(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
) error { ) error {
q := ` q := `
SELECT SELECT

6
pkg/coredata/saml_request.go
View File

@@ -33,7 +33,7 @@ type SAMLRequest struct {
func (s *SAMLRequest) Insert( func (s *SAMLRequest) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
query := ` query := `
INSERT INTO iam_saml_requests (id, organization_id, created_at, expires_at) 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( func LoadValidRequestIDsForOrganization(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
organizationID gid.GID, organizationID gid.GID,
now time.Time, now time.Time,
) ([]string, error) { ) ([]string, error) {
@@ -89,7 +89,7 @@ WHERE organization_id = @organization_id AND expires_at > @now
return requestIDs, nil 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 := ` query := `
DELETE FROM iam_saml_requests DELETE FROM iam_saml_requests
WHERE expires_at < @now WHERE expires_at < @now

16
pkg/coredata/scim_bridge.go
View File

@@ -60,7 +60,7 @@ func (s *SCIMBridge) CursorKey(orderBy SCIMBridgeOrderField) page.CursorKey {
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM iam_scim_bridges WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -76,7 +76,7 @@ func (s *SCIMBridge) AuthorizationAttributes(ctx context.Context, conn pg.Conn)
func (s *SCIMBridge) LoadByID( func (s *SCIMBridge) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
bridgeID gid.GID, bridgeID gid.GID,
) error { ) error {
@@ -131,7 +131,7 @@ LIMIT 1;
func (s *SCIMBridge) LoadByOrganizationID( func (s *SCIMBridge) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {
@@ -186,7 +186,7 @@ LIMIT 1;
func (s *SCIMBridge) LoadBySCIMConfigurationID( func (s *SCIMBridge) LoadBySCIMConfigurationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
scimConfigurationID gid.GID, scimConfigurationID gid.GID,
) error { ) error {
@@ -241,7 +241,7 @@ LIMIT 1;
func (s *SCIMBridge) Insert( func (s *SCIMBridge) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -311,7 +311,7 @@ INSERT INTO iam_scim_bridges (
func (s *SCIMBridge) Update( func (s *SCIMBridge) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -360,7 +360,7 @@ WHERE
func (s *SCIMBridge) LoadNextForSyncSkipLocked( func (s *SCIMBridge) LoadNextForSyncSkipLocked(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
staleSyncThreshold time.Duration, staleSyncThreshold time.Duration,
) error { ) error {
staleCutoff := time.Now().Add(-staleSyncThreshold) staleCutoff := time.Now().Add(-staleSyncThreshold)
@@ -418,7 +418,7 @@ FOR UPDATE SKIP LOCKED
func (s *SCIMBridge) Delete( func (s *SCIMBridge) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

14
pkg/coredata/scim_configuration.go
View File

@@ -50,7 +50,7 @@ func (s *SCIMConfiguration) CursorKey(orderBy SCIMConfigurationOrderField) page.
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM iam_scim_configurations WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -66,7 +66,7 @@ func (s *SCIMConfiguration) AuthorizationAttributes(ctx context.Context, conn pg
func (s *SCIMConfiguration) LoadByID( func (s *SCIMConfiguration) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
configID gid.GID, configID gid.GID,
) error { ) error {
@@ -124,7 +124,7 @@ LEFT JOIN
func (s *SCIMConfiguration) LoadByOrganizationID( func (s *SCIMConfiguration) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) error {
@@ -182,7 +182,7 @@ LEFT JOIN
func (s *SCIMConfiguration) LoadByHashedToken( func (s *SCIMConfiguration) LoadByHashedToken(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
hashedToken []byte, hashedToken []byte,
) error { ) error {
q := ` q := `
@@ -235,7 +235,7 @@ LEFT JOIN
func (s *SCIMConfiguration) Insert( func (s *SCIMConfiguration) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -282,7 +282,7 @@ INSERT INTO iam_scim_configurations (
func (s *SCIMConfiguration) Update( func (s *SCIMConfiguration) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -315,7 +315,7 @@ WHERE
func (s *SCIMConfiguration) Delete( func (s *SCIMConfiguration) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

14
pkg/coredata/scim_event.go
View File

@@ -56,7 +56,7 @@ func (s *SCIMEvent) CursorKey(orderBy SCIMEventOrderField) page.CursorKey {
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM iam_scim_events WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -72,7 +72,7 @@ func (s *SCIMEvent) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (
func (s *SCIMEvent) LoadByID( func (s *SCIMEvent) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
eventID gid.GID, eventID gid.GID,
) error { ) error {
@@ -124,7 +124,7 @@ LIMIT 1;
func (s *SCIMEvent) Insert( func (s *SCIMEvent) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -185,7 +185,7 @@ INSERT INTO iam_scim_events (
func (s *SCIMEvents) LoadByOrganizationID( func (s *SCIMEvents) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[SCIMEventOrderField], cursor *page.Cursor[SCIMEventOrderField],
@@ -235,7 +235,7 @@ WHERE
func (s *SCIMEvents) CountByOrganizationID( func (s *SCIMEvents) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) (int, error) { ) (int, error) {
@@ -265,7 +265,7 @@ WHERE
func (s *SCIMEvents) LoadBySCIMConfigurationID( func (s *SCIMEvents) LoadBySCIMConfigurationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
scimConfigurationID gid.GID, scimConfigurationID gid.GID,
cursor *page.Cursor[SCIMEventOrderField], cursor *page.Cursor[SCIMEventOrderField],
@@ -315,7 +315,7 @@ WHERE
func (s *SCIMEvents) CountBySCIMConfigurationID( func (s *SCIMEvents) CountBySCIMConfigurationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
scimConfigurationID gid.GID, scimConfigurationID gid.GID,
) (int, error) { ) (int, error) {

16
pkg/coredata/session.go
View File

@@ -96,7 +96,7 @@ func (s *Session) IsChildSession() bool {
func (s *Session) LoadByID( func (s *Session) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
sessionID gid.GID, sessionID gid.GID,
) error { ) error {
q := ` q := `
@@ -144,7 +144,7 @@ LIMIT 1;
// AuthorizationAttributes loads the minimal authorization attributes for policy condition evaluation. // AuthorizationAttributes loads the minimal authorization attributes for policy condition evaluation.
// It is intentionally lightweight and does not populate the Session struct. // 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 := ` q := `
SELECT SELECT
identity_id identity_id
@@ -168,7 +168,7 @@ LIMIT 1;
func (s *Session) Insert( func (s *Session) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
INSERT INTO INSERT INTO
@@ -214,7 +214,7 @@ VALUES (
func (s *Session) Update( func (s *Session) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
UPDATE iam_sessions UPDATE iam_sessions
@@ -251,7 +251,7 @@ WHERE
return nil 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 := ` q := `
SELECT SELECT
id, id,
@@ -295,7 +295,7 @@ WHERE
return nil 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 := ` q := `
SELECT SELECT
COUNT(*) COUNT(*)
@@ -317,7 +317,7 @@ WHERE
return count, nil 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 := ` q := `
UPDATE iam_sessions UPDATE iam_sessions
SET SET
@@ -345,7 +345,7 @@ WHERE
func (s *Session) LoadByRootSessionIDAndMembershipID( func (s *Session) LoadByRootSessionIDAndMembershipID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
rootSessionID gid.GID, rootSessionID gid.GID,
membershipID gid.GID, membershipID gid.GID,
) error { ) error {

22
pkg/coredata/slack_message.go
View File

@@ -57,7 +57,7 @@ func (e ErrSlackMessageNotFound) Error() string {
return "slack message not found" 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;` q := `SELECT organization_id FROM slack_messages WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -92,7 +92,7 @@ func NewSlackMessage(
func (s *SlackMessage) Insert( func (s *SlackMessage) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -151,7 +151,7 @@ VALUES (
func (s *SlackMessage) LoadNextUnsentForUpdate( func (s *SlackMessage) LoadNextUnsentForUpdate(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` 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 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( func (s *SlackMessage) LoadNextInitalUnsentForUpdate(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` 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 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( func (s *SlackMessage) LoadNextUpdateUnsentForUpdate(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
SELECT SELECT
@@ -265,7 +265,7 @@ FOR UPDATE OF sm
func (s *SlackMessage) LoadInitialByChannelAndTS( func (s *SlackMessage) LoadInitialByChannelAndTS(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
channelID string, channelID string,
messageTS string, messageTS string,
@@ -305,7 +305,7 @@ LIMIT 1
func (s *SlackMessage) Update( func (s *SlackMessage) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -335,7 +335,7 @@ WHERE id = @id AND %s
func (s *SlackMessage) UpdateChannelAndTSByInitialMessageID( func (s *SlackMessage) UpdateChannelAndTSByInitialMessageID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
initialSlackMessageID gid.GID, initialSlackMessageID gid.GID,
channelID string, channelID string,
@@ -369,7 +369,7 @@ WHERE initial_slack_message_id = @initial_slack_message_id AND %s
func (s *SlackMessage) LoadById( func (s *SlackMessage) LoadById(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
slackMessageID gid.GID, slackMessageID gid.GID,
) error { ) error {
@@ -408,7 +408,7 @@ LIMIT 1
func (s *SlackMessage) LoadLatestByInitialMessageID( func (s *SlackMessage) LoadLatestByInitialMessageID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
initialSlackMessageID gid.GID, initialSlackMessageID gid.GID,
) error { ) error {
@@ -448,7 +448,7 @@ LIMIT 1
func (s *SlackMessage) LoadLatestByRequesterEmailAndType( func (s *SlackMessage) LoadLatestByRequesterEmailAndType(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
requesterEmail mail.Addr, requesterEmail mail.Addr,

14
pkg/coredata/snapshot.go
View File

@@ -53,7 +53,7 @@ func (s *Snapshot) CursorKey(field SnapshotOrderField) page.CursorKey {
panic(fmt.Sprintf("unsupported order by: %s", field)) 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;` q := `SELECT organization_id FROM snapshots WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -69,7 +69,7 @@ func (s *Snapshot) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (m
func (s *Snapshot) LoadByID( func (s *Snapshot) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
snapshotID gid.GID, snapshotID gid.GID,
) error { ) error {
@@ -111,7 +111,7 @@ LIMIT 1;
func (s *Snapshots) CountByOrganizationID( func (s *Snapshots) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *SnapshotFilter, filter *SnapshotFilter,
@@ -145,7 +145,7 @@ WHERE
func (s *Snapshots) LoadByOrganizationID( func (s *Snapshots) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[SnapshotOrderField], cursor *page.Cursor[SnapshotOrderField],
@@ -189,7 +189,7 @@ WHERE
func (s *Snapshot) Insert( func (s *Snapshot) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -232,7 +232,7 @@ INSERT INTO snapshots (
func (s *Snapshot) Delete( func (s *Snapshot) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -258,7 +258,7 @@ WHERE
func (s *Snapshots) LoadByControlID( func (s *Snapshots) LoadByControlID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
controlID gid.GID, controlID gid.GID,
cursor *page.Cursor[SnapshotOrderField], cursor *page.Cursor[SnapshotOrderField],

2
pkg/coredata/snapshottable.go
View File

@@ -23,7 +23,7 @@ import (
) )
type Snapshottable interface { 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) { func GetSnapshottable(snapshotType SnapshotsType) (Snapshottable, error) {

20
pkg/coredata/state_of_applicability.go
View File

@@ -54,7 +54,7 @@ func (s StateOfApplicability) CursorKey(orderBy StateOfApplicabilityOrderField)
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM states_of_applicability WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -70,7 +70,7 @@ func (s *StateOfApplicability) AuthorizationAttributes(ctx context.Context, conn
func (s *StateOfApplicability) LoadByID( func (s *StateOfApplicability) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
stateOfApplicabilityID gid.GID, stateOfApplicabilityID gid.GID,
) error { ) error {
@@ -117,7 +117,7 @@ LIMIT 1;
func (s *StatesOfApplicability) LoadByOrganizationID( func (s *StatesOfApplicability) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[StateOfApplicabilityOrderField], cursor *page.Cursor[StateOfApplicabilityOrderField],
@@ -164,7 +164,7 @@ WHERE
func (s *StatesOfApplicability) CountByOrganizationID( func (s *StatesOfApplicability) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *StateOfApplicabilityFilter, filter *StateOfApplicabilityFilter,
@@ -198,7 +198,7 @@ WHERE
func (s *StateOfApplicability) Insert( func (s *StateOfApplicability) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -255,7 +255,7 @@ VALUES (
func (s *StateOfApplicability) Update( func (s *StateOfApplicability) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -299,7 +299,7 @@ WHERE
func (s *StateOfApplicability) Delete( func (s *StateOfApplicability) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -327,7 +327,7 @@ WHERE
return nil 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 { if err := soas.insertStateOfApplicabilitySnapshots(ctx, conn, scope, organizationID, snapshotID); err != nil {
return fmt.Errorf("cannot insert state_of_applicability snapshots: %w", err) 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( func (soas StatesOfApplicability) insertStateOfApplicabilitySnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,
@@ -395,7 +395,7 @@ WHERE
func (soas StatesOfApplicability) insertStateOfApplicabilityControlSnapshots( func (soas StatesOfApplicability) insertStateOfApplicabilityControlSnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

26
pkg/coredata/task.go
View File

@@ -64,7 +64,7 @@ func (t Task) CursorKey(orderBy TaskOrderField) page.CursorKey {
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM tasks WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -80,7 +80,7 @@ func (t *Task) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[s
func (t *Task) LoadByID( func (t *Task) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
taskID gid.GID, taskID gid.GID,
) error { ) error {
@@ -135,7 +135,7 @@ LIMIT 1;
func (t *Tasks) LoadByIDs( func (t *Tasks) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
taskIDs []gid.GID, taskIDs []gid.GID,
) error { ) error {
@@ -185,7 +185,7 @@ WHERE
func (t *Task) Insert( func (t *Task) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -265,7 +265,7 @@ RETURNING rank, priority_rank;
func (t *Task) Upsert( func (t *Task) Upsert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -365,7 +365,7 @@ RETURNING
func (t *Tasks) CountByOrganizationID( func (t *Tasks) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) (int, error) { ) (int, error) {
@@ -397,7 +397,7 @@ func (t *Tasks) CountByOrganizationID(
func (t *Tasks) LoadByOrganizationID( func (t *Tasks) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[TaskOrderField], cursor *page.Cursor[TaskOrderField],
@@ -449,7 +449,7 @@ func (t *Tasks) LoadByOrganizationID(
func (t *Tasks) CountByMeasureID( func (t *Tasks) CountByMeasureID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
measureID gid.GID, measureID gid.GID,
) (int, error) { ) (int, error) {
@@ -481,7 +481,7 @@ WHERE
func (t *Tasks) LoadByMeasureID( func (t *Tasks) LoadByMeasureID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
measureID gid.GID, measureID gid.GID,
cursor *page.Cursor[TaskOrderField], cursor *page.Cursor[TaskOrderField],
@@ -533,7 +533,7 @@ WHERE
func (t *Task) Update( func (t *Task) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -574,7 +574,7 @@ WHERE %s
func (t *Task) NextRankForStatePriority( func (t *Task) NextRankForStatePriority(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -613,7 +613,7 @@ WHERE
func (t *Task) UpdateRank( func (t *Task) UpdateRank(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -668,7 +668,7 @@ WHERE %s
func (t *Task) Delete( func (t *Task) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

6
pkg/coredata/token.go
View File

@@ -34,7 +34,7 @@ type Token struct {
func (t *Token) LoadByHashedValueForUpdate( func (t *Token) LoadByHashedValueForUpdate(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
hashedValue []byte, hashedValue []byte,
) error { ) error {
q := ` q := `
@@ -72,7 +72,7 @@ FOR UPDATE;
func (t *Token) Insert( func (t *Token) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
INSERT INTO iam_tokens( INSERT INTO iam_tokens(
@@ -109,7 +109,7 @@ INSERT INTO iam_tokens(
func (t *Token) Delete( func (t *Token) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
) error { ) error {
q := ` q := `
DELETE FROM iam_tokens DELETE FROM iam_tokens

20
pkg/coredata/transfer_impact_assessment.go
View File

@@ -56,7 +56,7 @@ func (tia *TransferImpactAssessment) CursorKey(field TransferImpactAssessmentOrd
panic(fmt.Sprintf("unsupported order by: %s", field)) 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;` q := `SELECT organization_id FROM processing_activity_transfer_impact_assessments WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -73,7 +73,7 @@ func (tia *TransferImpactAssessment) AuthorizationAttributes(ctx context.Context
func (tias *TransferImpactAssessments) CountByOrganizationID( func (tias *TransferImpactAssessments) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *TransferImpactAssessmentFilter, filter *TransferImpactAssessmentFilter,
@@ -108,7 +108,7 @@ WHERE
func (tias *TransferImpactAssessments) LoadByOrganizationID( func (tias *TransferImpactAssessments) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[TransferImpactAssessmentOrderField], cursor *page.Cursor[TransferImpactAssessmentOrderField],
@@ -161,7 +161,7 @@ WHERE
func (tias *TransferImpactAssessments) LoadAllByOrganizationID( func (tias *TransferImpactAssessments) LoadAllByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *TransferImpactAssessmentFilter, filter *TransferImpactAssessmentFilter,
@@ -211,7 +211,7 @@ WHERE
func (tia *TransferImpactAssessment) LoadByID( func (tia *TransferImpactAssessment) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
tiaID gid.GID, tiaID gid.GID,
) error { ) error {
@@ -262,7 +262,7 @@ LIMIT 1;
func (tia *TransferImpactAssessment) LoadByProcessingActivityID( func (tia *TransferImpactAssessment) LoadByProcessingActivityID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
processingActivityID gid.GID, processingActivityID gid.GID,
) error { ) error {
@@ -313,7 +313,7 @@ LIMIT 1;
func (tia *TransferImpactAssessment) Insert( func (tia *TransferImpactAssessment) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -375,7 +375,7 @@ INSERT INTO processing_activity_transfer_impact_assessments (
func (tia *TransferImpactAssessment) Update( func (tia *TransferImpactAssessment) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -414,7 +414,7 @@ WHERE
func (tia *TransferImpactAssessment) Delete( func (tia *TransferImpactAssessment) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -439,7 +439,7 @@ WHERE
func (tias TransferImpactAssessments) InsertProcessingActivitySnapshots( func (tias TransferImpactAssessments) InsertProcessingActivitySnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

14
pkg/coredata/trust_center.go
View File

@@ -56,7 +56,7 @@ func (tc *TrustCenter) CursorKey(orderBy TrustCenterOrderField) page.CursorKey {
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM trust_centers WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -72,7 +72,7 @@ func (tc *TrustCenter) AuthorizationAttributes(ctx context.Context, conn pg.Conn
func (tc *TrustCenter) LoadByID( func (tc *TrustCenter) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterID gid.GID, trustCenterID gid.GID,
) error { ) error {
@@ -124,7 +124,7 @@ LIMIT 1;
func (tc *TrustCenter) LoadByMailingListID( func (tc *TrustCenter) LoadByMailingListID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
mailingListID gid.GID, mailingListID gid.GID,
) error { ) error {
@@ -176,7 +176,7 @@ LIMIT 1;
func (tc *TrustCenter) LoadByOrganizationID( func (tc *TrustCenter) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) error { ) 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. // 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( func (tc *TrustCenter) LoadBySlug(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
slug string, slug string,
) error { ) error {
q := ` q := `
@@ -276,7 +276,7 @@ LIMIT 1;
func (tc *TrustCenter) Insert( func (tc *TrustCenter) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -340,7 +340,7 @@ INSERT INTO trust_centers (
func (tc *TrustCenter) Update( func (tc *TrustCenter) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `

14
pkg/coredata/trust_center_access.go
View File

@@ -52,7 +52,7 @@ func (tca *TrustCenterAccess) CursorKey(orderBy TrustCenterAccessOrderField) pag
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM trust_center_accesses WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -68,7 +68,7 @@ func (tca *TrustCenterAccess) AuthorizationAttributes(ctx context.Context, conn
func (tca *TrustCenterAccess) LoadByID( func (tca *TrustCenterAccess) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
accessID gid.GID, accessID gid.GID,
) error { ) error {
@@ -116,7 +116,7 @@ LIMIT 1;
func (tca *TrustCenterAccess) LoadByTrustCenterIDAndIdentityID( func (tca *TrustCenterAccess) LoadByTrustCenterIDAndIdentityID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterID gid.GID, trustCenterID gid.GID,
identityID gid.GID, identityID gid.GID,
@@ -169,7 +169,7 @@ LIMIT 1;
func (tca *TrustCenterAccess) Insert( func (tca *TrustCenterAccess) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -221,7 +221,7 @@ INSERT INTO trust_center_accesses (
func (tca *TrustCenterAccess) Update( func (tca *TrustCenterAccess) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -252,7 +252,7 @@ WHERE
func (tca *TrustCenterAccess) Delete( func (tca *TrustCenterAccess) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -279,7 +279,7 @@ WHERE
func (tcas *TrustCenterAccesses) LoadByTrustCenterID( func (tcas *TrustCenterAccesses) LoadByTrustCenterID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterID gid.GID, trustCenterID gid.GID,
cursor *page.Cursor[TrustCenterAccessOrderField], cursor *page.Cursor[TrustCenterAccessOrderField],

50
pkg/coredata/trust_center_document_access.go
View File

@@ -53,7 +53,7 @@ func (tcda *TrustCenterDocumentAccess) CursorKey(orderBy TrustCenterDocumentAcce
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM trust_center_document_accesses WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -69,7 +69,7 @@ func (tcda *TrustCenterDocumentAccess) AuthorizationAttributes(ctx context.Conte
func (tcda *TrustCenterDocumentAccess) LoadByID( func (tcda *TrustCenterDocumentAccess) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
accessID gid.GID, accessID gid.GID,
) error { ) error {
@@ -117,7 +117,7 @@ LIMIT 1;
func (tcda *TrustCenterDocumentAccess) LoadByTrustCenterAccessIDAndDocumentID( func (tcda *TrustCenterDocumentAccess) LoadByTrustCenterAccessIDAndDocumentID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
documentID gid.GID, documentID gid.GID,
@@ -171,7 +171,7 @@ LIMIT 1;
func (tcda *TrustCenterDocumentAccess) LoadByTrustCenterAccessIDAndReportID( func (tcda *TrustCenterDocumentAccess) LoadByTrustCenterAccessIDAndReportID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
reportID gid.GID, reportID gid.GID,
@@ -225,7 +225,7 @@ LIMIT 1;
func (tcda *TrustCenterDocumentAccess) Insert( func (tcda *TrustCenterDocumentAccess) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -288,7 +288,7 @@ INSERT INTO trust_center_document_accesses (
func (tcda *TrustCenterDocumentAccess) Update( func (tcda *TrustCenterDocumentAccess) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -319,7 +319,7 @@ WHERE
func (tcda *TrustCenterDocumentAccess) Delete( func (tcda *TrustCenterDocumentAccess) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -346,7 +346,7 @@ WHERE
func (tcdas *TrustCenterDocumentAccesses) CountByTrustCenterAccessID( func (tcdas *TrustCenterDocumentAccesses) CountByTrustCenterAccessID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
) (int, error) { ) (int, error) {
@@ -379,7 +379,7 @@ WHERE
func (tcdas *TrustCenterDocumentAccesses) CountPendingRequestByTrustCenterAccessID( func (tcdas *TrustCenterDocumentAccesses) CountPendingRequestByTrustCenterAccessID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
) (int, error) { ) (int, error) {
@@ -413,7 +413,7 @@ WHERE
func (tcdas *TrustCenterDocumentAccesses) CountActiveByTrustCenterAccessID( func (tcdas *TrustCenterDocumentAccesses) CountActiveByTrustCenterAccessID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
) (int, error) { ) (int, error) {
@@ -447,7 +447,7 @@ WHERE
func (tcdas *TrustCenterDocumentAccesses) LoadAvailableByTrustCenterAccessID( func (tcdas *TrustCenterDocumentAccesses) LoadAvailableByTrustCenterAccessID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
cursor *page.Cursor[TrustCenterDocumentAccessOrderField], cursor *page.Cursor[TrustCenterDocumentAccessOrderField],
@@ -569,7 +569,7 @@ WHERE %s
func (tcdas *TrustCenterDocumentAccesses) LoadAllByTrustCenterAccessID( func (tcdas *TrustCenterDocumentAccesses) LoadAllByTrustCenterAccessID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
) error { ) error {
@@ -616,7 +616,7 @@ ORDER BY id ASC
func GrantByDocumentIDs( func GrantByDocumentIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
documentIDs []gid.GID, documentIDs []gid.GID,
@@ -650,7 +650,7 @@ WHERE
func RejectOrRevokeByDocumentIDs( func RejectOrRevokeByDocumentIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
documentIDs []gid.GID, documentIDs []gid.GID,
@@ -689,7 +689,7 @@ WHERE
func GrantByReportIDs( func GrantByReportIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
reportIDs []gid.GID, reportIDs []gid.GID,
@@ -723,7 +723,7 @@ WHERE
func RejectOrRevokeByReportIDs( func RejectOrRevokeByReportIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
reportIDs []gid.GID, reportIDs []gid.GID,
@@ -767,7 +767,7 @@ type MergeTrustCenterDocumentAccessesData struct {
func (tcdas TrustCenterDocumentAccesses) MergeDocumentAccesses( func (tcdas TrustCenterDocumentAccesses) MergeDocumentAccesses(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
@@ -840,7 +840,7 @@ WHEN NOT MATCHED
func (tcdas TrustCenterDocumentAccesses) BulkInsertDocumentAccesses( func (tcdas TrustCenterDocumentAccesses) BulkInsertDocumentAccesses(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
organizationID gid.GID, organizationID gid.GID,
@@ -902,7 +902,7 @@ ON CONFLICT DO NOTHING
func (tcdas TrustCenterDocumentAccesses) MergeReportAccesses( func (tcdas TrustCenterDocumentAccesses) MergeReportAccesses(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
@@ -975,7 +975,7 @@ WHEN NOT MATCHED
func (tcdas TrustCenterDocumentAccesses) BulkInsertReportAccesses( func (tcdas TrustCenterDocumentAccesses) BulkInsertReportAccesses(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
organizationID gid.GID, organizationID gid.GID,
@@ -1037,7 +1037,7 @@ ON CONFLICT DO NOTHING
func (tcda *TrustCenterDocumentAccess) LoadByTrustCenterAccessIDAndTrustCenterFileID( func (tcda *TrustCenterDocumentAccess) LoadByTrustCenterAccessIDAndTrustCenterFileID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
trustCenterFileID gid.GID, trustCenterFileID gid.GID,
@@ -1091,7 +1091,7 @@ LIMIT 1;
func GrantByTrustCenterFileIDs( func GrantByTrustCenterFileIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
trustCenterFileIDs []gid.GID, trustCenterFileIDs []gid.GID,
@@ -1125,7 +1125,7 @@ WHERE
func RejectOrRevokeByTrustCenterFileIDs( func RejectOrRevokeByTrustCenterFileIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
trustCenterFileIDs []gid.GID, trustCenterFileIDs []gid.GID,
@@ -1164,7 +1164,7 @@ WHERE
func (tcdas TrustCenterDocumentAccesses) MergeTrustCenterFileAccesses( func (tcdas TrustCenterDocumentAccesses) MergeTrustCenterFileAccesses(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
@@ -1237,7 +1237,7 @@ WHEN NOT MATCHED
func (tcdas TrustCenterDocumentAccesses) BulkInsertTrustCenterFileAccesses( func (tcdas TrustCenterDocumentAccesses) BulkInsertTrustCenterFileAccesses(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterAccessID gid.GID, trustCenterAccessID gid.GID,
organizationID gid.GID, organizationID gid.GID,

18
pkg/coredata/trust_center_file.go
View File

@@ -54,7 +54,7 @@ func (t TrustCenterFile) CursorKey(orderBy TrustCenterFileOrderField) page.Curso
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM trust_center_files WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -70,7 +70,7 @@ func (t *TrustCenterFile) AuthorizationAttributes(ctx context.Context, conn pg.C
func (t *TrustCenterFile) LoadByID( func (t *TrustCenterFile) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterFileID gid.GID, trustCenterFileID gid.GID,
) error { ) error {
@@ -113,7 +113,7 @@ LIMIT 1;
func (f *TrustCenterFiles) LoadByIDs( func (f *TrustCenterFiles) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterFileIDs []gid.GID, trustCenterFileIDs []gid.GID,
) error { ) error {
@@ -157,7 +157,7 @@ WHERE
func (t TrustCenterFile) Insert( func (t TrustCenterFile) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -208,7 +208,7 @@ VALUES (
func (t *TrustCenterFile) Update( func (t *TrustCenterFile) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -260,7 +260,7 @@ RETURNING
func (t *TrustCenterFile) Delete( func (t *TrustCenterFile) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -286,7 +286,7 @@ WHERE
func (t *TrustCenterFiles) LoadByOrganizationID( func (t *TrustCenterFiles) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[TrustCenterFileOrderField], cursor *page.Cursor[TrustCenterFileOrderField],
@@ -335,7 +335,7 @@ WHERE
func (t *TrustCenterFiles) CountByOrganizationID( func (t *TrustCenterFiles) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
) (int, error) { ) (int, error) {
@@ -365,7 +365,7 @@ WHERE
func (t *TrustCenterFiles) LoadAllByOrganizationID( func (t *TrustCenterFiles) LoadAllByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *TrustCenterFileFilter, filter *TrustCenterFileFilter,

16
pkg/coredata/trust_center_reference.go
View File

@@ -59,7 +59,7 @@ func (t TrustCenterReference) CursorKey(orderBy TrustCenterReferenceOrderField)
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) 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;` q := `SELECT organization_id FROM trust_center_references WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -75,7 +75,7 @@ func (t *TrustCenterReference) AuthorizationAttributes(ctx context.Context, conn
func (t *TrustCenterReference) LoadByID( func (t *TrustCenterReference) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterReferenceID gid.GID, trustCenterReferenceID gid.GID,
) error { ) error {
@@ -120,7 +120,7 @@ LIMIT 1;
func (t *TrustCenterReference) Insert( func (t *TrustCenterReference) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -183,7 +183,7 @@ RETURNING rank;
func (t *TrustCenterReference) Update( func (t *TrustCenterReference) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -225,7 +225,7 @@ WHERE
func (t *TrustCenterReference) UpdateRank( func (t *TrustCenterReference) UpdateRank(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -275,7 +275,7 @@ WHERE %s
func (t *TrustCenterReference) Delete( func (t *TrustCenterReference) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -301,7 +301,7 @@ WHERE
func (t *TrustCenterReferences) LoadByTrustCenterID( func (t *TrustCenterReferences) LoadByTrustCenterID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterID gid.GID, trustCenterID gid.GID,
cursor *page.Cursor[TrustCenterReferenceOrderField], cursor *page.Cursor[TrustCenterReferenceOrderField],
@@ -349,7 +349,7 @@ WHERE
func (t *TrustCenterReferences) CountByTrustCenterID( func (t *TrustCenterReferences) CountByTrustCenterID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
trustCenterID gid.GID, trustCenterID gid.GID,
) (int, error) { ) (int, error) {

42
pkg/coredata/vendor.go
View File

@@ -61,7 +61,7 @@ type (
Vendors []*Vendor Vendors []*Vendor
VendorSnapshotter interface { 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)) 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;` q := `SELECT organization_id FROM vendors WHERE id = $1 LIMIT 1;`
var organizationID gid.GID var organizationID gid.GID
@@ -94,7 +94,7 @@ func (v *Vendor) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map
func (v *Vendor) LoadByID( func (v *Vendor) LoadByID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
vendorID gid.GID, vendorID gid.GID,
) error { ) error {
@@ -162,7 +162,7 @@ LIMIT 1;
func (v *Vendors) LoadByIDs( func (v *Vendors) LoadByIDs(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
vendorIDs []gid.GID, vendorIDs []gid.GID,
) error { ) error {
@@ -224,7 +224,7 @@ WHERE
func (v Vendor) Insert( func (v Vendor) Insert(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -324,7 +324,7 @@ VALUES (
func (v Vendor) Delete( func (v Vendor) Delete(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -342,7 +342,7 @@ DELETE FROM vendors WHERE %s AND id = @vendor_id
func (v *Vendors) CountByOrganizationID( func (v *Vendors) CountByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *VendorFilter, filter *VendorFilter,
@@ -377,7 +377,7 @@ WHERE
func (v *Vendors) LoadByOrganizationID( func (v *Vendors) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
cursor *page.Cursor[VendorOrderField], cursor *page.Cursor[VendorOrderField],
@@ -444,7 +444,7 @@ WHERE
func (v *Vendor) Update( func (v *Vendor) Update(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
) error { ) error {
q := ` q := `
@@ -509,7 +509,7 @@ WHERE %s
func (v Vendor) ExpireNonExpiredRiskAssessments( func (v Vendor) ExpireNonExpiredRiskAssessments(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
) error { ) error {
now := time.Now() now := time.Now()
@@ -543,7 +543,7 @@ func (v Vendor) ExpireNonExpiredRiskAssessments(
func (v *Vendors) CountByAssetID( func (v *Vendors) CountByAssetID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
assetID gid.GID, assetID gid.GID,
) (int, error) { ) (int, error) {
@@ -582,7 +582,7 @@ WHERE %s
func (v *Vendors) LoadByAssetID( func (v *Vendors) LoadByAssetID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
assetID gid.GID, assetID gid.GID,
cursor *page.Cursor[VendorOrderField], cursor *page.Cursor[VendorOrderField],
@@ -680,7 +680,7 @@ WHERE %s
func (v *Vendors) CountByDatumID( func (v *Vendors) CountByDatumID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
datumID gid.GID, datumID gid.GID,
) (int, error) { ) (int, error) {
@@ -719,7 +719,7 @@ WHERE %s
func (vs *Vendors) LoadByDatumID( func (vs *Vendors) LoadByDatumID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
datumID gid.GID, datumID gid.GID,
cursor *page.Cursor[VendorOrderField], cursor *page.Cursor[VendorOrderField],
@@ -817,7 +817,7 @@ WHERE %s
func (v *Vendors) LoadByProcessingActivityID( func (v *Vendors) LoadByProcessingActivityID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
processingActivityID gid.GID, processingActivityID gid.GID,
cursor *page.Cursor[VendorOrderField], cursor *page.Cursor[VendorOrderField],
@@ -915,7 +915,7 @@ WHERE %s
func (v *Vendors) LoadAllByProcessingActivities( func (v *Vendors) LoadAllByProcessingActivities(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Querier,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
filter *ProcessingActivityFilter, filter *ProcessingActivityFilter,
@@ -983,7 +983,7 @@ ORDER BY
func (d Vendors) InsertDataSnapshots( func (d Vendors) InsertDataSnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,
@@ -1085,7 +1085,7 @@ FROM source_vendors v
func (vs Vendors) InsertAssetSnapshots( func (vs Vendors) InsertAssetSnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,
@@ -1187,7 +1187,7 @@ FROM source_vendors v
func (vs Vendors) InsertProcessingActivitySnapshots( func (vs Vendors) InsertProcessingActivitySnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,
@@ -1287,7 +1287,7 @@ FROM source_vendors v
return nil 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{ for _, snapshotter := range []VendorSnapshotter{
Vendors{}, Vendors{},
VendorServices{}, VendorServices{},
@@ -1307,7 +1307,7 @@ func (v Vendors) Snapshot(ctx context.Context, conn pg.Conn, scope Scoper, organ
func (v Vendors) InsertVendorSnapshots( func (v Vendors) InsertVendorSnapshots(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Tx,
scope Scoper, scope Scoper,
organizationID gid.GID, organizationID gid.GID,
snapshotID gid.GID, snapshotID gid.GID,

Some files were not shown because too many files have changed in this diff Show More