Skip to content

Commit ea94b34

Browse files
golanglemonadegolanglemonade
authored
feat: get mapped controls resolver (#2481)
* wip Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * wip Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * comments + fmt Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * linter Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * wip: resolvers Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * cleanup1 Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * some tests Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * additinoal data, tests Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * regenerate Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * fixes Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * more test Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * cleanup, comments, tests for all user types Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * regen Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * fix control owner Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * perf, consolidation Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> * regen: gqlgen changes from latest version Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com> --------- Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>
1 parent a8e4f5e commit ea94b34

156 files changed

Lines changed: 25342 additions & 9592 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.task/checksum/generate-graphql-smart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1b8513706e203e7a6f856ecf81a3b9c2
1+
b05b80c9d79a68422d7087a36b9bc93e

‎.task/checksum/generate-openapi-smart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3a24b651c1f0fe4846c9e1a42f363057
1+
3ed8d295ffed42595ce9be3527b8040c

‎cli/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ require (
8181
github.com/openfga/language/pkg/go v0.2.1 // indirect
8282
github.com/philhofer/fwd v1.2.0 // indirect
8383
github.com/pkg/errors v0.9.1 // indirect
84-
github.com/redis/go-redis/v9 v9.20.0 // indirect
84+
github.com/redis/go-redis/v9 v9.20.1 // indirect
8585
github.com/robfig/cron/v3 v3.0.1 // indirect
8686
github.com/segmentio/asm v1.2.1 // indirect
8787
github.com/sosodev/duration v1.4.0 // indirect
@@ -106,7 +106,7 @@ require (
106106
golang.org/x/crypto v0.53.0 // indirect
107107
golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a // indirect
108108
golang.org/x/image v0.41.0 // indirect
109-
golang.org/x/net v0.55.0 // indirect
109+
golang.org/x/net v0.56.0 // indirect
110110
golang.org/x/sync v0.21.0 // indirect
111111
golang.org/x/sys v0.46.0 // indirect
112112
golang.org/x/text v0.38.0 // indirect

‎cli/go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
170170
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
171171
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
172172
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
173-
github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0=
174-
github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA=
173+
github.com/redis/go-redis/v9 v9.20.1 h1:sfCU6A8P3dXbKyWes02uxA2baehGux9dZHfEKtsTB1w=
175174
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
176175
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
177176
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
@@ -262,8 +261,7 @@ golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a h1:+3jdDGGB8NGb1Zktc737jlt3/
262261
golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw=
263262
golang.org/x/image v0.41.0 h1:8wS72eGJMJaBxK6okTzd4WaXumUlTVlb753MlsSvTCo=
264263
golang.org/x/image v0.41.0/go.mod h1:uIc348UZMSvS5Z65CVZ7iDPaNobNFEPeJ4kbqTOszmA=
265-
golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
266-
golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
264+
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
267265
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
268266
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
269267
golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=

‎cmd/serve.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ func serve(ctx context.Context) error {
278278
// add auth and integration options
279279
so.AddServerOptions(
280280
serveropts.WithAuth(),
281-
serveropts.WithIntegrationsRuntime(dbClient),
281+
serveropts.WithIntegrationsRuntime(ctx, dbClient),
282282
)
283283

284284
// add session manager

‎common/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
require (
2424
ariga.io/atlas v1.2.2 // indirect
2525
entgo.io/contrib v0.7.0 // indirect
26-
github.com/99designs/gqlgen v0.17.90 // indirect
26+
github.com/99designs/gqlgen v0.17.91 // indirect
2727
github.com/XSAM/otelsql v0.42.0 // indirect
2828
github.com/agext/levenshtein v1.2.3 // indirect
2929
github.com/agnivade/levenshtein v1.2.1 // indirect
@@ -89,11 +89,11 @@ require (
8989
golang.org/x/crypto v0.53.0 // indirect
9090
golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a // indirect
9191
golang.org/x/mod v0.37.0 // indirect
92-
golang.org/x/net v0.55.0 // indirect
92+
golang.org/x/net v0.56.0 // indirect
9393
golang.org/x/sync v0.21.0 // indirect
9494
golang.org/x/sys v0.46.0 // indirect
9595
golang.org/x/text v0.38.0 // indirect
96-
golang.org/x/tools v0.45.0 // indirect
96+
golang.org/x/tools v0.46.0 // indirect
9797
google.golang.org/genproto/googleapis/api v0.0.0-20260504160031-60b97b32f348 // indirect
9898
google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect
9999
google.golang.org/grpc v1.81.1 // indirect

‎common/go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ entgo.io/contrib v0.7.0 h1:4Ghx8O0rqSMmca3FIJ6QyZbQAoLvdzWqLMl1MbHFEEw=
44
entgo.io/contrib v0.7.0/go.mod h1:zbPSUrbn+6dfyv8S9HWEvn1MyGpO95ik2lUNgaqWTt4=
55
entgo.io/ent v0.14.6 h1:/f2696BpwuWAEEG6PVGWflg6+Inrpq4pRWuNlWz/Skk=
66
entgo.io/ent v0.14.6/go.mod h1:z46QBUdGC+BATwsedbDuREfSS0oSCV+csdEYlL4p73s=
7-
github.com/99designs/gqlgen v0.17.90 h1:wSv6blm/PoplU6QoNw83EcQpNtC0HX3/+44vITJOzpk=
8-
github.com/99designs/gqlgen v0.17.90/go.mod h1:GqYrEwYsqCG8VaOsq2kJUCUKwAE1T+u2i+Nj7NtXiVI=
7+
github.com/99designs/gqlgen v0.17.91 h1:/mIvXnN0lAorqszP3Vukw10SVRfLVUYtBTQFwmYRMmI=
98
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
109
github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
1110
github.com/XSAM/otelsql v0.42.0 h1:Li0xF4eJUxG2e0x3D4rvRlys1f27yJKvjTh7ljkUP5o=
@@ -26,6 +25,7 @@ github.com/brianvoe/gofakeit/v7 v7.15.0 h1:kGLYAWN8tnmxq2PelKVK6zwpM7kMxdz9SGPH3
2625
github.com/brianvoe/gofakeit/v7 v7.15.0/go.mod h1:QXuPeBw164PJCzCUZVmgpgHJ3Llj49jSLVkKPMtxtxA=
2726
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
2827
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
28+
github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g=
2929
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3030
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3131
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -213,8 +213,7 @@ golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsi
213213
golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a h1:+3jdDGGB8NGb1Zktc737jlt3/A5f6UlwSzmvqUuufxw=
214214
golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw=
215215
golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
216-
golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
217-
golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
216+
golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
218217
golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
219218
golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q=
220219
golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
@@ -223,8 +222,7 @@ golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
223222
golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
224223
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
225224
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
226-
golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8=
227-
golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0=
225+
golang.org/x/tools v0.46.0 h1:7jTurBkPZu4moS/Uy4OQT1M+QBlsj3wejyZwsT8Z7rk=
228226
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
229227
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
230228
google.golang.org/genproto/googleapis/api v0.0.0-20260504160031-60b97b32f348 h1:U8orV30l6KpDsi9dxU0CoJZGbjS8EEpw+6ba+XwGPQA=

‎internal/graphapi/checksum/.schema_checksum‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c09d15e1bd97217bef56600f40d1a10bee00bae8aa187111cddab62c3e2a2274
1+
41c0b37264ed7c7f7805a886624220c21578fc5e725bd5a063c49f66f24a0d03

‎internal/graphapi/clientschema/checksum/.schema_checksum‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1f0215938f4c05f5ea88e55e882244407ae88d374790e279b954f24c757c2775
1+
b37bf160ec25b24d87b13263d55606aa7715f15eabb5180d9c0b97c8a86fee86

0 commit comments

Comments
 (0)