From 81c3f20ad301d7d7688e5129e24e99af3b602299 Mon Sep 17 00:00:00 2001 From: matthewpeterkort Date: Wed, 15 Oct 2025 08:21:31 -0700 Subject: [PATCH 1/4] update jsonschemagraph dep to support single edge gen --- go.mod | 6 ++---- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index a2d80fde..2c14a98e 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/bmeg/grip -go 1.24 - -toolchain go1.24.2 +go 1.24.2 require ( github.com/IBM/sarama v1.45.1 @@ -13,7 +11,7 @@ require ( github.com/bmeg/benchtop v0.0.0-20250827195345-9810354883b9 github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad github.com/bmeg/jsonschema/v6 v6.0.4 - github.com/bmeg/jsonschemagraph v0.0.4-0.20250828230703-257ca9afd85a + github.com/bmeg/jsonschemagraph v0.0.4-0.20251015150525-9ed100499f63 github.com/boltdb/bolt v1.3.1 github.com/bytedance/sonic v1.14.0 github.com/casbin/casbin/v2 v2.97.0 diff --git a/go.sum b/go.sum index 6c09f3d7..ae124e68 100644 --- a/go.sum +++ b/go.sum @@ -41,8 +41,8 @@ github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad h1:ICgBexeLB7iv/IQz4 github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad/go.mod h1:ft96Irkp72C7ZrUWRenG7LrF0NKMxXdRvsypo5Njhm4= github.com/bmeg/jsonschema/v6 v6.0.4 h1:AXFAz7G05VZkKretSSU+uacMKF8+C16ONG6pzFzzA7E= github.com/bmeg/jsonschema/v6 v6.0.4/go.mod h1:gTh32doM+BEZyi/TDPJEp8k3qXTckXY4ohptV2xExQY= -github.com/bmeg/jsonschemagraph v0.0.4-0.20250828230703-257ca9afd85a h1:O0JcMLcazrwVzf8iC/RogUen4CG5UVErrBU76UkxhYQ= -github.com/bmeg/jsonschemagraph v0.0.4-0.20250828230703-257ca9afd85a/go.mod h1:rlek2WcKAhnynqE7NJi8U+RDbUkRFr8Kqpb2SDmcW94= +github.com/bmeg/jsonschemagraph v0.0.4-0.20251015150525-9ed100499f63 h1:vXw9uZsI22wSqJsQDnje1fetSv5iQTkXGJKRFJP8+S4= +github.com/bmeg/jsonschemagraph v0.0.4-0.20251015150525-9ed100499f63/go.mod h1:Ve7jAQhYAMkHUiko99+2CwqXI4Ur0ty/ai8Tfa2ONz4= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= From 9ca459b75288b6d74947914ebb637362e44a818b Mon Sep 17 00:00:00 2001 From: matthewpeterkort Date: Fri, 17 Oct 2025 13:55:07 -0700 Subject: [PATCH 2/4] update validator to use custom method type validators --- go.mod | 3 ++- go.sum | 6 ++++++ server/metagraphs.go | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 2c14a98e..25c0f5a0 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/bmeg/benchtop v0.0.0-20250827195345-9810354883b9 github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad github.com/bmeg/jsonschema/v6 v6.0.4 - github.com/bmeg/jsonschemagraph v0.0.4-0.20251015150525-9ed100499f63 + github.com/bmeg/jsonschemagraph v0.0.4-0.20251017205345-236d2de9887c github.com/boltdb/bolt v1.3.1 github.com/bytedance/sonic v1.14.0 github.com/casbin/casbin/v2 v2.97.0 @@ -63,6 +63,7 @@ require ( github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/bmeg/golib v0.0.0-20200725232156-e799a31439fc // indirect github.com/bytedance/sonic/loader v0.3.0 // indirect github.com/casbin/govaluate v1.2.0 // indirect github.com/cespare/xxhash v1.1.0 // indirect diff --git a/go.sum b/go.sum index ae124e68..46ddaeec 100644 --- a/go.sum +++ b/go.sum @@ -37,12 +37,18 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bmeg/benchtop v0.0.0-20250827195345-9810354883b9 h1:sIgPwNZKv3pSuIm/hngszbBrg3pKlZcyJ+HTzeFyjNA= github.com/bmeg/benchtop v0.0.0-20250827195345-9810354883b9/go.mod h1:Jy39KqCHrPeU9J3SEAdVnZ5dxE6VZm8tX899z5n6ud8= +github.com/bmeg/golib v0.0.0-20200725232156-e799a31439fc h1:/0v/ZcXYjGs44InmjECrls31onIbVKVu1Q/E2cmnCEU= +github.com/bmeg/golib v0.0.0-20200725232156-e799a31439fc/go.mod h1:hoSeuZtqe58ANXHuWpeODx4bDHGV36QXlCs1yrUvK6M= github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad h1:ICgBexeLB7iv/IQz4rsP+MimOXFZUwWSPojEypuOaQ8= github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad/go.mod h1:ft96Irkp72C7ZrUWRenG7LrF0NKMxXdRvsypo5Njhm4= github.com/bmeg/jsonschema/v6 v6.0.4 h1:AXFAz7G05VZkKretSSU+uacMKF8+C16ONG6pzFzzA7E= github.com/bmeg/jsonschema/v6 v6.0.4/go.mod h1:gTh32doM+BEZyi/TDPJEp8k3qXTckXY4ohptV2xExQY= github.com/bmeg/jsonschemagraph v0.0.4-0.20251015150525-9ed100499f63 h1:vXw9uZsI22wSqJsQDnje1fetSv5iQTkXGJKRFJP8+S4= github.com/bmeg/jsonschemagraph v0.0.4-0.20251015150525-9ed100499f63/go.mod h1:Ve7jAQhYAMkHUiko99+2CwqXI4Ur0ty/ai8Tfa2ONz4= +github.com/bmeg/jsonschemagraph v0.0.4-0.20251017205159-c430853877eb h1:I/dIUg+RciaJ615cFlaN1SFgmM5SuLFOiiE8QqpeYW4= +github.com/bmeg/jsonschemagraph v0.0.4-0.20251017205159-c430853877eb/go.mod h1:Ve7jAQhYAMkHUiko99+2CwqXI4Ur0ty/ai8Tfa2ONz4= +github.com/bmeg/jsonschemagraph v0.0.4-0.20251017205345-236d2de9887c h1:J1EhcEmL1D/YHxoMIw4HeeVv+hRMUFezNlAAlFX/a8M= +github.com/bmeg/jsonschemagraph v0.0.4-0.20251017205345-236d2de9887c/go.mod h1:Ve7jAQhYAMkHUiko99+2CwqXI4Ur0ty/ai8Tfa2ONz4= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= diff --git a/server/metagraphs.go b/server/metagraphs.go index 7f56cef7..afd8df11 100644 --- a/server/metagraphs.go +++ b/server/metagraphs.go @@ -163,6 +163,15 @@ func (server *GripServer) addFullGraph(ctx context.Context, graphName string, sc func (server *GripServer) LoadSchemas(sch *gripql.Graph, out *graph.GraphSchema) (*graph.GraphSchema, error) { compiler := jsonschema.NewCompiler() + + compiler.AssertFormat() + compiler.RegisterFormat(&jsonschema.Format{Name: "date-time", Validate: compile.ValidateFhirDateTime}) + compiler.RegisterFormat(&jsonschema.Format{Name: "date", Validate: compile.ValidateFhirDate}) + compiler.RegisterFormat(&jsonschema.Format{Name: "binary", Validate: compile.ValidateFhirBinary}) + compiler.RegisterFormat(&jsonschema.Format{Name: "binary", Validate: compile.ValidateFhirTime}) + compiler.RegisterFormat(&jsonschema.Format{Name: "uuid", Validate: compile.ValidateFhirUUID}) + compiler.RegisterFormat(&jsonschema.Format{Name: "uri", Validate: compile.ValidateFhirURI}) + compiler.AssertVocabs() vc, err := compile.GetHyperMediaVocab() if err != nil { From 9bd6b071c9c1abc3d8837efd6ac247e4efac2fc8 Mon Sep 17 00:00:00 2001 From: matthewpeterkort Date: Mon, 20 Oct 2025 08:16:42 -0700 Subject: [PATCH 3/4] fix typo --- server/metagraphs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/metagraphs.go b/server/metagraphs.go index afd8df11..e8f0cdf2 100644 --- a/server/metagraphs.go +++ b/server/metagraphs.go @@ -168,7 +168,7 @@ func (server *GripServer) LoadSchemas(sch *gripql.Graph, out *graph.GraphSchema) compiler.RegisterFormat(&jsonschema.Format{Name: "date-time", Validate: compile.ValidateFhirDateTime}) compiler.RegisterFormat(&jsonschema.Format{Name: "date", Validate: compile.ValidateFhirDate}) compiler.RegisterFormat(&jsonschema.Format{Name: "binary", Validate: compile.ValidateFhirBinary}) - compiler.RegisterFormat(&jsonschema.Format{Name: "binary", Validate: compile.ValidateFhirTime}) + compiler.RegisterFormat(&jsonschema.Format{Name: "time", Validate: compile.ValidateFhirTime}) compiler.RegisterFormat(&jsonschema.Format{Name: "uuid", Validate: compile.ValidateFhirUUID}) compiler.RegisterFormat(&jsonschema.Format{Name: "uri", Validate: compile.ValidateFhirURI}) From 8ede9cc2051335d973173281e202f44f5e3d1aa0 Mon Sep 17 00:00:00 2001 From: matthewpeterkort Date: Wed, 22 Oct 2025 15:17:10 -0700 Subject: [PATCH 4/4] update kafka image tag --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4fbae641..1d05ed53 100644 --- a/Makefile +++ b/Makefile @@ -159,7 +159,7 @@ start-kafka: -e KAFKA_CLIENT_PASSWORDS=adminpassword \ -e KAFKA_CFG_SASL_ENABLED_MECHANISMS=PLAIN \ -e KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL=PLAIN \ - bitnami/kafka:latest + bitnamilegacy/kafka:4.0.0-debian-12-r10 printf '%s\n' \ 'security.protocol=SASL_PLAINTEXT' \ 'sasl.mechanism=PLAIN' \