Skip to content

Commit 3a168a3

Browse files
committed
fix(alpha): jsonschema minification
1 parent 90c892d commit 3a168a3

File tree

48 files changed

+52
-48
lines changed

Some content is hidden

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

48 files changed

+52
-48
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ integration-test/cut
2020
app/src/test/resources/openai.properties
2121

2222
grpc-proxy/envoy-local.yaml
23+
protos/temp

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,11 @@ json-schema:
3939
copy-json-schema-to-resources: json-schema
4040
@ find app/src/main/resources/jsonschema -type d -maxdepth 1 -mindepth 1 | xargs -I{} rm -rf {}
4141
@ mkdir -p app/src/main/resources/jsonschema
42-
@ cp -r protos/json-schema/* app/src/main/resources/jsonschema
43-
@ find app/src/main/resources/jsonschema -type f -name "*.json" | xargs -I{} sh -c 'export file="{}" && cat {} | jq -r tostring > "$$file.tmp" && mv "$$file.tmp" "$$file"'
42+
@ rm -rf protos/temp
43+
@ cp -r protos/json-schema protos/temp
44+
@ cd protos/json-schema && find . -type f -name "*.json" -exec sh -c "cat {} | jq -r tostring > ../temp/{}" \;
45+
@ cp -r protos/temp/* app/src/main/resources/jsonschema
46+
@ rm -rf protos/temp
4447

4548
integration-test:
4649
@ chmod go-rw integration-test/pgpass
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListTablesRequest","definitions":{"ListTablesRequest":{"properties":{"catalog_id":{"type":"string"},"database_id":{"type":"string"},"schema_id":{"type":"string"}},"additionalProperties":false,"type":"object","title":"List Tables Request"}}}
1+
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/GetBlueprintPolicyRequest","definitions":{"GetBlueprintPolicyRequest":{"properties":{"catalog_id":{"type":"string"},"database_id":{"type":"string"},"schema_id":{"type":"string"},"table_id":{"type":"string"}},"additionalProperties":false,"type":"object","title":"Get Blueprint Policy Request"}}}

app/src/main/resources/jsonschema/getstrm.pace.api.data_catalogs.v1alpha/GetBlueprintPolicyResponse.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListTablesRequest","definitions":{"ListTablesRequest":{"properties":{"catalog_id":{"type":"string"},"database_id":{"type":"string"},"schema_id":{"type":"string"}},"additionalProperties":false,"type":"object","title":"List Tables Request"}}}
1+
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListCatalogsRequest","definitions":{"ListCatalogsRequest":{"additionalProperties":false,"type":"object","title":"List Catalogs Request"}}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListTablesRequest","definitions":{"ListTablesRequest":{"properties":{"catalog_id":{"type":"string"},"database_id":{"type":"string"},"schema_id":{"type":"string"}},"additionalProperties":false,"type":"object","title":"List Tables Request"}}}
1+
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListCatalogsResponse","definitions":{"ListCatalogsResponse":{"properties":{"catalogs":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog"},"additionalProperties":false,"type":"array"}},"additionalProperties":false,"type":"object","title":"List Catalogs Response"},"getstrm.pace.api.entities.v1alpha.DataCatalog":{"properties":{"id":{"type":"string","description":"An arbitrary but unique identifier for the catalog. This matches the id from the PACE app configuration."},"type":{"enum":["TYPE_UNSPECIFIED",0,"COLLIBRA",1,"ODD",2,"DATAHUB",3],"oneOf":[{"type":"string"},{"type":"integer"}],"title":"Type"},"databases":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Database"},"additionalProperties":false,"type":"array","description":"A top-most level of the catalog. This is typically a database."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Data Catalog"},"getstrm.pace.api.entities.v1alpha.DataCatalog.Database":{"properties":{"id":{"type":"string","description":"The id used by the catalog."},"type":{"type":"string"},"display_name":{"type":"string"},"catalog":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog","additionalProperties":false,"description":"The parent catalog to which this database belongs."},"schemas":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Schema"},"additionalProperties":false,"type":"array","description":"The schemas in this database."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Database"},"getstrm.pace.api.entities.v1alpha.DataCatalog.Schema":{"properties":{"id":{"type":"string","description":"The id used by the catalog."},"name":{"type":"string","description":"The parent database to which this schema belongs."},"database":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Database","additionalProperties":false},"tables":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Table"},"additionalProperties":false,"type":"array","description":"The tables in this schema."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Schema"},"getstrm.pace.api.entities.v1alpha.DataCatalog.Table":{"properties":{"id":{"type":"string","description":"The id used by the catalog."},"name":{"type":"string"},"schema":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Schema","additionalProperties":false,"description":"The parent schema to which this table belongs."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Table"}}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListTablesRequest","definitions":{"ListTablesRequest":{"properties":{"catalog_id":{"type":"string"},"database_id":{"type":"string"},"schema_id":{"type":"string"}},"additionalProperties":false,"type":"object","title":"List Tables Request"}}}
1+
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListDatabasesRequest","definitions":{"ListDatabasesRequest":{"properties":{"catalog_id":{"type":"string"}},"additionalProperties":false,"type":"object","title":"List Databases Request"}}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListTablesRequest","definitions":{"ListTablesRequest":{"properties":{"catalog_id":{"type":"string"},"database_id":{"type":"string"},"schema_id":{"type":"string"}},"additionalProperties":false,"type":"object","title":"List Tables Request"}}}
1+
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListDatabasesResponse","definitions":{"ListDatabasesResponse":{"properties":{"databases":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Database"},"additionalProperties":false,"type":"array"}},"additionalProperties":false,"type":"object","title":"List Databases Response"},"getstrm.pace.api.entities.v1alpha.DataCatalog":{"properties":{"id":{"type":"string","description":"An arbitrary but unique identifier for the catalog. This matches the id from the PACE app configuration."},"type":{"enum":["TYPE_UNSPECIFIED",0,"COLLIBRA",1,"ODD",2,"DATAHUB",3],"oneOf":[{"type":"string"},{"type":"integer"}],"title":"Type"},"databases":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Database"},"additionalProperties":false,"type":"array","description":"A top-most level of the catalog. This is typically a database."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Data Catalog"},"getstrm.pace.api.entities.v1alpha.DataCatalog.Database":{"properties":{"id":{"type":"string","description":"The id used by the catalog."},"type":{"type":"string"},"display_name":{"type":"string"},"catalog":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog","additionalProperties":false,"description":"The parent catalog to which this database belongs."},"schemas":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Schema"},"additionalProperties":false,"type":"array","description":"The schemas in this database."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Database"},"getstrm.pace.api.entities.v1alpha.DataCatalog.Schema":{"properties":{"id":{"type":"string","description":"The id used by the catalog."},"name":{"type":"string","description":"The parent database to which this schema belongs."},"database":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Database","additionalProperties":false},"tables":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Table"},"additionalProperties":false,"type":"array","description":"The tables in this schema."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Schema"},"getstrm.pace.api.entities.v1alpha.DataCatalog.Table":{"properties":{"id":{"type":"string","description":"The id used by the catalog."},"name":{"type":"string"},"schema":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Schema","additionalProperties":false,"description":"The parent schema to which this table belongs."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Table"}}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListTablesRequest","definitions":{"ListTablesRequest":{"properties":{"catalog_id":{"type":"string"},"database_id":{"type":"string"},"schema_id":{"type":"string"}},"additionalProperties":false,"type":"object","title":"List Tables Request"}}}
1+
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListSchemasRequest","definitions":{"ListSchemasRequest":{"properties":{"catalog_id":{"type":"string"},"database_id":{"type":"string"}},"additionalProperties":false,"type":"object","title":"List Schemas Request"}}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListTablesRequest","definitions":{"ListTablesRequest":{"properties":{"catalog_id":{"type":"string"},"database_id":{"type":"string"},"schema_id":{"type":"string"}},"additionalProperties":false,"type":"object","title":"List Tables Request"}}}
1+
{"$schema":"http://json-schema.org/draft-04/schema#","$ref":"#/definitions/ListSchemasResponse","definitions":{"ListSchemasResponse":{"properties":{"schemas":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Schema"},"additionalProperties":false,"type":"array"}},"additionalProperties":false,"type":"object","title":"List Schemas Response","description":"(-- api-linter: core::0158::response-plural-first-field=disabled aip.dev/not-precedent: Schemata? Get real. --)"},"getstrm.pace.api.entities.v1alpha.DataCatalog":{"properties":{"id":{"type":"string","description":"An arbitrary but unique identifier for the catalog. This matches the id from the PACE app configuration."},"type":{"enum":["TYPE_UNSPECIFIED",0,"COLLIBRA",1,"ODD",2,"DATAHUB",3],"oneOf":[{"type":"string"},{"type":"integer"}],"title":"Type"},"databases":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Database"},"additionalProperties":false,"type":"array","description":"A top-most level of the catalog. This is typically a database."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Data Catalog"},"getstrm.pace.api.entities.v1alpha.DataCatalog.Database":{"properties":{"id":{"type":"string","description":"The id used by the catalog."},"type":{"type":"string"},"display_name":{"type":"string"},"catalog":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog","additionalProperties":false,"description":"The parent catalog to which this database belongs."},"schemas":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Schema"},"additionalProperties":false,"type":"array","description":"The schemas in this database."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Database"},"getstrm.pace.api.entities.v1alpha.DataCatalog.Schema":{"properties":{"id":{"type":"string","description":"The id used by the catalog."},"name":{"type":"string","description":"The parent database to which this schema belongs."},"database":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Database","additionalProperties":false},"tables":{"items":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Table"},"additionalProperties":false,"type":"array","description":"The tables in this schema."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Schema"},"getstrm.pace.api.entities.v1alpha.DataCatalog.Table":{"properties":{"id":{"type":"string","description":"The id used by the catalog."},"name":{"type":"string"},"schema":{"$ref":"#/definitions/getstrm.pace.api.entities.v1alpha.DataCatalog.Schema","additionalProperties":false,"description":"The parent schema to which this table belongs."},"tags":{"items":{"type":"string"},"type":"array"}},"additionalProperties":false,"type":"object","title":"Table"}}}

0 commit comments

Comments
 (0)