Skip to content
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.

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

♻️ Maintenance/removing-old-json-schemas 🚨 #3966

Merged
Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
bea275e
replacing manually created openapi for projects -> with automatic vie…
matusdrobuliak66 Mar 10, 2023
90e1631
WIP: refactoring/testing different options how to replace old node-me…
matusdrobuliak66 Mar 12, 2023
fd650b1
WIP: refactoring/testing different options how to replace old node-me…
matusdrobuliak66 Mar 12, 2023
70e3217
testing 2. approach
matusdrobuliak66 Mar 13, 2023
ab23c45
minor cleaning
matusdrobuliak66 Mar 13, 2023
3745f3e
Merge branch 'master' into maintenance/upgrade-of-pydantic-library
matusdrobuliak66 Mar 13, 2023
6ce1c94
putting back typing in directory
matusdrobuliak66 Mar 13, 2023
06833b5
Merge branch 'maintenance/upgrade-of-pydantic-library' of github.com:…
matusdrobuliak66 Mar 13, 2023
850354a
make modification to Pydantic Project model to be backcompatible
matusdrobuliak66 Mar 13, 2023
2cd350d
fix python-linting test fails
matusdrobuliak66 Mar 14, 2023
8412c14
testing exclusiveMinimum removed on TextArea
matusdrobuliak66 Mar 14, 2023
b4bfee8
fix - generating schema with version of Pydantic 10.0.2
matusdrobuliak66 Mar 14, 2023
d30cf0b
testing - minHeight problem in tests
matusdrobuliak66 Mar 14, 2023
0135c62
correction of unit test (as i have added example on first index)
matusdrobuliak66 Mar 14, 2023
3270557
minor - adding comments
matusdrobuliak66 Mar 14, 2023
0af6457
minor - adding comments
matusdrobuliak66 Mar 14, 2023
38ed2c7
fix - removing old project-v0.0.1.json
matusdrobuliak66 Mar 14, 2023
c0831c3
removing old json schemas
matusdrobuliak66 Mar 14, 2023
382e7ba
adding min lenght to the thumbnail to be back compatible
matusdrobuliak66 Mar 14, 2023
487f4a9
testing changes of TextArea that is doing problems in director v0
matusdrobuliak66 Mar 14, 2023
29d89be
removing changes from director v0 - we should not touch him
matusdrobuliak66 Mar 15, 2023
4332e77
removing changes from director v0 - we should not touch him
matusdrobuliak66 Mar 15, 2023
aa836b6
adding back original json schemas, as they are still needed in the di…
matusdrobuliak66 Mar 15, 2023
92b99ae
removing exclusiveMinimum from the TextArea so we are back compatible
matusdrobuliak66 Mar 15, 2023
27a2f68
putting previous changes back as it didnt help
matusdrobuliak66 Mar 15, 2023
8a2e81b
Merge branch 'master' into maintenance/upgrade-of-pydantic-library
matusdrobuliak66 Mar 15, 2023
0909b4c
patching of project json schema - to work as before
matusdrobuliak66 Mar 19, 2023
bf7c000
overwriting min length of HttpUrl to be back compatible
matusdrobuliak66 Mar 19, 2023
074a6ed
Merge branch 'master' into maintenance/upgrade-of-pydantic-library
matusdrobuliak66 Mar 19, 2023
ce74990
removing old json -converted.json files that are not used anymore
matusdrobuliak66 Mar 19, 2023
0b25f3f
Merge branch 'maintenance/upgrade-of-pydantic-library' of github.com:…
matusdrobuliak66 Mar 19, 2023
2d81193
fix - HttpUrlWithCustomMinLenght dependency
matusdrobuliak66 Mar 19, 2023
f3a217c
commented by a mistake
matusdrobuliak66 Mar 20, 2023
7214f5f
removing helper yaml files + removing old json schema files
matusdrobuliak66 Mar 20, 2023
3d58a97
director needs node-meta-v0.0.1.json in the api/specs
matusdrobuliak66 Mar 20, 2023
3fa8d5b
update test comments
matusdrobuliak66 Mar 20, 2023
9aeeb2a
dealing with conflicts
matusdrobuliak66 Mar 30, 2023
42b7864
Merge branch 'master' into maintenance/upgrade-of-pydantic-library
matusdrobuliak66 Mar 30, 2023
73ba609
Merge branch 'master' into maintenance/upgrade-of-pydantic-library
matusdrobuliak66 Mar 30, 2023
8d177c2
Merge branch 'master' into maintenance/upgrade-of-pydantic-library
matusdrobuliak66 Apr 3, 2023
54d3280
removing old json schema files
matusdrobuliak66 Apr 3, 2023
75362da
Merge branch 'maintenance/upgrade-of-pydantic-library' of github.com:…
matusdrobuliak66 Apr 3, 2023
9b0eab5
removing forgotten file
matusdrobuliak66 Apr 3, 2023
e6598d6
we will leave the old project-v0.0.1.json - until we fix #3992 issue
matusdrobuliak66 Apr 3, 2023
9ecc3cb
Merge branch 'master' into maintenance/upgrade-of-pydantic-library
matusdrobuliak66 Apr 3, 2023
19a3b0c
Merge branch 'master' into maintenance/upgrade-of-pydantic-library
matusdrobuliak66 Apr 4, 2023
d873cb7
Merge branch 'master' into maintenance/upgrade-of-pydantic-library
matusdrobuliak66 Apr 4, 2023
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ new-service: .venv ## Bakes a new project from cookiecutter-simcore-pyservice an
openapi-specs: ## bundles and validates openapi specifications and schemas of ALL service's API
@$(MAKE_C) services/web/server $@
@$(MAKE_C) services/storage $@
@$(MAKE_C) services/director $@


.PHONY: settings-schema.json
settings-schema.json: ## [container] dumps json-schema settings of all services
Expand Down
15 changes: 13 additions & 2 deletions api/specs/common/schemas/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
.PHONY: all build clean help

objects = $(wildcard *.json)
outputs := $(objects:.json=-converted.yaml)
objects = $(wildcard *-pydantic.json)
outputs := $(objects:.json=-converted-clean.yaml)

depreciated_files = node-meta-v0.0.1-converted.yaml

TOOL_IMAGE_NAME := json-schema-to-openapi-schema

Expand All @@ -15,6 +17,15 @@ all: check $(outputs)
-v ${CURDIR}:/output \
$(TOOL_IMAGE_NAME)

rm -f ${depreciated_files}

.PRECIOUS: %-converted.yaml
%-converted-clean.yaml:%-converted.yaml
# remove the "definition" key from %-converted.yaml
python scripts/remove_definitions.py $^ $@

rm -f $^

# target: check – Checks whether tool is installed
check:
@docker history $(TOOL_IMAGE_NAME) 2>/dev/null \
Expand Down
348 changes: 0 additions & 348 deletions api/specs/common/schemas/node-meta-v0.0.1-converted.yaml

This file was deleted.

Loading