Skip to content

Move JSON schema helpers to json ingestion gem #1201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jwils wants to merge 1 commit into
base: joshuaw/schema-extension-plumbing
Choose a base branch
from
Open

Move JSON schema helpers to json ingestion gem #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CODEBASE_OVERVIEW.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ graph LR;
rackup["rackup"];
rake["rake"];
webrick["webrick"];
elasticgraph-json_ingestion["eg-json_ingestion"];
elasticgraph-schema_artifacts["eg-schema_artifacts"];
graphql["graphql"];
elasticgraph --> elasticgraph-support;
Expand All @@ -125,6 +126,7 @@ graph LR;
elasticgraph-local --> webrick;
elasticgraph-schema_definition --> elasticgraph-graphql;
elasticgraph-schema_definition --> elasticgraph-indexer;
elasticgraph-schema_definition --> elasticgraph-json_ingestion;
elasticgraph-schema_definition --> elasticgraph-schema_artifacts;
elasticgraph-schema_definition --> elasticgraph-support;
elasticgraph-schema_definition --> graphql;
Expand All @@ -141,6 +143,7 @@ graph LR;
class rackup externalGemCatStyle;
class rake externalGemCatStyle;
class webrick externalGemCatStyle;
class elasticgraph-json_ingestion otherEgGemStyle;
class elasticgraph-schema_artifacts otherEgGemStyle;
class graphql externalGemCatStyle;
click thor href "https://rubygems.org/gems/thor" "Open on RubyGems.org" _blank;
Expand Down
1 change: 1 addition & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ PATH
elasticgraph-schema_definition (1.2.1.pre)
elasticgraph-graphql (= 1.2.1.pre)
elasticgraph-indexer (= 1.2.1.pre)
elasticgraph-json_ingestion (= 1.2.1.pre)
elasticgraph-schema_artifacts (= 1.2.1.pre)
elasticgraph-support (= 1.2.1.pre)
graphql (~> 2.6.2)
Expand Down
1 change: 1 addition & 0 deletions config/docker_demo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ COPY elasticgraph-datastore_core elasticgraph-datastore_core/
COPY elasticgraph-graphiql elasticgraph-graphiql/
COPY elasticgraph-graphql elasticgraph-graphql/
COPY elasticgraph-indexer elasticgraph-indexer/
COPY elasticgraph-json_ingestion elasticgraph-json_ingestion/
COPY elasticgraph-local elasticgraph-local/
COPY elasticgraph-opensearch elasticgraph-opensearch/
COPY elasticgraph-query_registry elasticgraph-query_registry/
Expand Down
1 change: 1 addition & 0 deletions elasticgraph-apollo/apollo_tests_implementation/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ COPY elasticgraph-elasticsearch /web/elasticgraph-elasticsearch
COPY elasticgraph-graphiql /web/elasticgraph-graphiql
COPY elasticgraph-graphql /web/elasticgraph-graphql
COPY elasticgraph-indexer /web/elasticgraph-indexer
COPY elasticgraph-json_ingestion /web/elasticgraph-json_ingestion
COPY elasticgraph-rack /web/elasticgraph-rack
COPY elasticgraph-schema_artifacts /web/elasticgraph-schema_artifacts
COPY elasticgraph-schema_definition /web/elasticgraph-schema_definition
Expand Down
1 change: 1 addition & 0 deletions elasticgraph-apollo/apollo_tests_implementation/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ source "https://rubygems.org"
graphiql
graphql
indexer
json_ingestion
rack
schema_artifacts
schema_definition
Expand Down
3 changes: 3 additions & 0 deletions elasticgraph-json_ingestion/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ graph LR;
elasticgraph-support["elasticgraph-support"];
elasticgraph-json_ingestion --> elasticgraph-support;
class elasticgraph-support otherEgGemStyle;
elasticgraph-schema_definition["elasticgraph-schema_definition"];
elasticgraph-schema_definition --> elasticgraph-json_ingestion;
class elasticgraph-schema_definition otherEgGemStyle;
```
0 ...ema_definition/indexing/event_envelope.rb → ...ema_definition/indexing/event_envelope.rb
View file
Open in desktop
File renamed without changes.
0 ...on/indexing/json_schema_field_metadata.rb → ...on/indexing/json_schema_field_metadata.rb
View file
Open in desktop
File renamed without changes.
0 ...ion/indexing/json_schema_with_metadata.rb → ...ion/indexing/json_schema_with_metadata.rb
View file
Open in desktop
File renamed without changes.
0 ...h/schema_definition/json_schema_pruner.rb → ...n/schema_definition/json_schema_pruner.rb
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions elasticgraph-json_ingestion/sig/elastic_graph/json_ingestion.rbs
View file
Open in desktop
Copy link
Copy Markdown
Collaborator

@myronmarston myronmarston May 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/nit Looks like this is needed to type check due to elasticgraph-json_ingestion/lib/elastic_graph/json_ingestion.rb in #1199 defining this module. If you decide to address https://github.com/block/elasticgraph/pull/1199/changes#r3278668713, can this also be dropped?

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module ElasticGraph
module JSONIngestion
end
end
0 ...ma_definition/indexing/event_envelope.rbs → ...ma_definition/indexing/event_envelope.rbs
View file
Open in desktop
File renamed without changes.
0 ...n/indexing/json_schema_field_metadata.rbs → ...n/indexing/json_schema_field_metadata.rbs
View file
Open in desktop
File renamed without changes.
0 ...on/indexing/json_schema_with_metadata.rbs → ...on/indexing/json_schema_with_metadata.rbs
View file
Open in desktop
File renamed without changes.
0 .../schema_definition/json_schema_pruner.rbs → .../schema_definition/json_schema_pruner.rbs
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions elasticgraph-schema_definition/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ graph LR;
elasticgraph-indexer["elasticgraph-indexer"];
elasticgraph-schema_definition --> elasticgraph-indexer;
class elasticgraph-indexer otherEgGemStyle;
elasticgraph-json_ingestion["elasticgraph-json_ingestion"];
elasticgraph-schema_definition --> elasticgraph-json_ingestion;
class elasticgraph-json_ingestion otherEgGemStyle;
elasticgraph-schema_artifacts["elasticgraph-schema_artifacts"];
elasticgraph-schema_definition --> elasticgraph-schema_artifacts;
class elasticgraph-schema_artifacts otherEgGemStyle;
Expand Down
1 change: 1 addition & 0 deletions elasticgraph-schema_definition/elasticgraph-schema_definition.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Gem::Specification.new do |spec|

spec.add_dependency "elasticgraph-graphql", ElasticGraph::VERSION # needed since we validate that scalar `coerce_with` options are valid (which loads scalar coercion adapters)
spec.add_dependency "elasticgraph-indexer", ElasticGraph::VERSION # needed since we validate that scalar `prepare_for_indexing_with` options are valid (which loads indexing preparer adapters)
spec.add_dependency "elasticgraph-json_ingestion", ElasticGraph::VERSION
Copy link
Copy Markdown
Collaborator

@myronmarston myronmarston May 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like elasticgraph-json_ingestion to be an optional extension that is not even installed in EG projects that opt to use proto ingestion for all indexed types.

If the gem is needed in the test suite, can this be add_development_dependency?

spec.add_dependency "elasticgraph-schema_artifacts", ElasticGraph::VERSION
spec.add_dependency "elasticgraph-support", ElasticGraph::VERSION
spec.add_dependency "graphql", "~> 2.6.2"
Expand Down
2 changes: 1 addition & 1 deletion elasticgraph-schema_definition/lib/elastic_graph/schema_definition/indexing/field.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# frozen_string_literal: true

require "elastic_graph/constants"
require "elastic_graph/schema_definition/indexing/json_schema_field_metadata"
require "elastic_graph/json_ingestion/schema_definition/indexing/json_schema_field_metadata"
require "elastic_graph/schema_definition/indexing/list_counts_mapping"
require "elastic_graph/support/hash_util"
require "elastic_graph/support/memoizable_data"
Expand Down
6 changes: 3 additions & 3 deletions elasticgraph-schema_definition/lib/elastic_graph/schema_definition/results.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

require "elastic_graph/constants"
require "elastic_graph/errors"
require "elastic_graph/schema_artifacts/runtime_metadata/schema"
require "elastic_graph/json_ingestion/schema_definition/indexing/event_envelope"
require "elastic_graph/json_ingestion/schema_definition/indexing/json_schema_with_metadata"
require "elastic_graph/schema_artifacts/artifacts_helper_methods"
require "elastic_graph/schema_definition/indexing/event_envelope"
require "elastic_graph/schema_definition/indexing/json_schema_with_metadata"
require "elastic_graph/schema_artifacts/runtime_metadata/schema"
require "elastic_graph/schema_definition/indexing/relationship_resolver"
require "elastic_graph/schema_definition/indexing/update_target_resolver"
require "elastic_graph/schema_definition/mixins/has_readable_to_s_and_inspect"
Expand Down
2 changes: 1 addition & 1 deletion ...ticgraph-schema_definition/lib/elastic_graph/schema_definition/schema_artifact_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

require "did_you_mean"
require "elastic_graph/constants"
require "elastic_graph/schema_definition/json_schema_pruner"
require "elastic_graph/json_ingestion/schema_definition/json_schema_pruner"
require "elastic_graph/support/graphql_gem_loader"
require "elastic_graph/support/memoizable_data"
require "fileutils"
Expand Down
2 changes: 1 addition & 1 deletion ...tion/spec/unit/elastic_graph/schema_definition/indexing/json_schema_with_metadata_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#
# frozen_string_literal: true

require "elastic_graph/json_ingestion/schema_definition/indexing/json_schema_with_metadata"
require "elastic_graph/spec_support/schema_definition_helpers"
require "elastic_graph/schema_definition/indexing/json_schema_with_metadata"

module ElasticGraph
module SchemaDefinition
Expand Down
2 changes: 1 addition & 1 deletion ...ph-schema_definition/spec/unit/elastic_graph/schema_definition/json_schema_pruner_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# frozen_string_literal: true

require "elastic_graph/constants"
require "elastic_graph/json_ingestion/schema_definition/json_schema_pruner"
require "elastic_graph/spec_support/schema_definition_helpers"
require "elastic_graph/schema_definition/json_schema_pruner"

module ElasticGraph
module SchemaDefinition
Expand Down
Loading