get main #168
Merged
get main #168
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Basic logic for token checking * Initial Firebase Setup * Implemented token system * Linting checks * Linting checks * firebase_admin dependency added * added requirement * firebase_admin added to specific requirements * adds service account certificate env var from github secrests * removes superflous dependency 'pnmlbpmntransformer' * 💚 * 💚 Changes service account certificate env var handling * Check Tokens Function added * adds basic decodation of base64 service account certificate * Refactor service account certificate handling * fixes set_force_std_xml flag position * now uses correct var for decoding base64 * added tempfile for secret * remove unused dependency * test prints added * test * test * test * test * test * test * test * test * test * test * test * test * t * test * test * test * test * test * improved code quality * final touches * fixes cd pipeline: sets necessary env var for gcp service account certificate * fix cd pipeline: also sets env var in matrix job * replaces print message for missing env var with exception --------- Co-authored-by: Jeldrik Merkelbach <[email protected]> Co-authored-by: Jeldrik Merkelbach <[email protected]>
* Basic logic for token checking * Initial Firebase Setup * Implemented token system * Linting checks * Linting checks * firebase_admin dependency added * added requirement * firebase_admin added to specific requirements * adds service account certificate env var from github secrests * removes superflous dependency 'pnmlbpmntransformer' * 💚 * 💚 Changes service account certificate env var handling * Check Tokens Function added * adds basic decodation of base64 service account certificate * Refactor service account certificate handling * fixes set_force_std_xml flag position * now uses correct var for decoding base64 * added tempfile for secret * remove unused dependency * test prints added * test * test * test * test * test * test * test * test * test * test * test * test * t * test * test * test * test * test * improved code quality * final touches * fixes cd pipeline: sets necessary env var for gcp service account certificate * fix cd pipeline: also sets env var in matrix job * replaces print message for missing env var with exception * swaps checkout and env set step in cd pipeline * removes workflow dispatch and finally fixes CD env var (hopefully) --------- Co-authored-by: Jeldrik Merkelbach <[email protected]> Co-authored-by: Jeldrik Merkelbach <[email protected]>
* remerge (#143) * Add Swagger UI (#128) * Wwi21/103 secure against xml vulnerabilities (#127) * adds env var for XML security to CI and CD pipeline * adds XML security env var to docker container * raise exception if xml var does not exist * Add secure xml package * fixes linting errors * Remove unnecessary tkinter import * tries to fix env var setting for CI pipeline * correctly sets FUNCTION_ENV_VARS in CD pipeline --------- Co-authored-by: Kevin Stolz <[email protected]> * Wwi21/33 building docker image for on prem deployment (#129) * Integrate transformer * implements matrix build * fixes typo * adds second function for integration * fixes test setup for multiple functions * fixes module issue for tests * adds boilerplate tests for transform endpoint * testing dependecy caching * upes to build in caching functionality for pip * extracts python version into env var * reenables linting in pipeline * fixes identation error * adds timestamp to gcf deployment name * makes definition of env variables the first step * added basic Docker file for dhbw server * makes source code linting conform * testing transform endpoint as module for gcp deployment * converts back to old imports * updates docker file to allow for transformer module import * fixes merge conflict within transform.py * makes source code linter conform * updaes CD-pipeline to build and push docker image to GCR * now for reald cd and not ci * fixes CD pipeline permissions * pushes docker image to docker hub on deploy --------- Co-authored-by: Kevin <[email protected]> * Wwi21/33 building docker image for on prem deployment (#130) * Integrate transformer * implements matrix build * fixes typo * adds second function for integration * fixes test setup for multiple functions * fixes module issue for tests * adds boilerplate tests for transform endpoint * testing dependecy caching * upes to build in caching functionality for pip * extracts python version into env var * reenables linting in pipeline * fixes identation error * adds timestamp to gcf deployment name * makes definition of env variables the first step * added basic Docker file for dhbw server * makes source code linting conform * testing transform endpoint as module for gcp deployment * converts back to old imports * updates docker file to allow for transformer module import * fixes merge conflict within transform.py * makes source code linter conform * updaes CD-pipeline to build and push docker image to GCR * now for reald cd and not ci * fixes CD pipeline permissions * pushes docker image to docker hub on deploy * fixes typo --------- Co-authored-by: Kevin <[email protected]> * Wwi21/33 building docker image for on prem deployment (#131) * Integrate transformer * implements matrix build * fixes typo * adds second function for integration * fixes test setup for multiple functions * fixes module issue for tests * adds boilerplate tests for transform endpoint * testing dependecy caching * upes to build in caching functionality for pip * extracts python version into env var * reenables linting in pipeline * fixes identation error * adds timestamp to gcf deployment name * makes definition of env variables the first step * added basic Docker file for dhbw server * makes source code linting conform * testing transform endpoint as module for gcp deployment * converts back to old imports * updates docker file to allow for transformer module import * fixes merge conflict within transform.py * makes source code linter conform * updaes CD-pipeline to build and push docker image to GCR * now for reald cd and not ci * fixes CD pipeline permissions * pushes docker image to docker hub on deploy * fixes typo * adds env vars for docker image push --------- Co-authored-by: Kevin <[email protected]> * Wwi21/33 building docker image for on prem deployment (#132) * Integrate transformer * implements matrix build * fixes typo * adds second function for integration * fixes test setup for multiple functions * fixes module issue for tests * adds boilerplate tests for transform endpoint * testing dependecy caching * upes to build in caching functionality for pip * extracts python version into env var * reenables linting in pipeline * fixes identation error * adds timestamp to gcf deployment name * makes definition of env variables the first step * added basic Docker file for dhbw server * makes source code linting conform * testing transform endpoint as module for gcp deployment * converts back to old imports * updates docker file to allow for transformer module import * fixes merge conflict within transform.py * makes source code linter conform * updaes CD-pipeline to build and push docker image to GCR * now for reald cd and not ci * fixes CD pipeline permissions * pushes docker image to docker hub on deploy * fixes typo * adds env vars for docker image push * makes cd jobs parallel * tries to add github token to attestation step --------- Co-authored-by: Kevin <[email protected]> * Wwi21/33 building docker image for on prem deployment (#134) * Integrate transformer * implements matrix build * fixes typo * adds second function for integration * fixes test setup for multiple functions * fixes module issue for tests * adds boilerplate tests for transform endpoint * testing dependecy caching * upes to build in caching functionality for pip * extracts python version into env var * reenables linting in pipeline * fixes identation error * adds timestamp to gcf deployment name * makes definition of env variables the first step * added basic Docker file for dhbw server * makes source code linting conform * testing transform endpoint as module for gcp deployment * converts back to old imports * updates docker file to allow for transformer module import * fixes merge conflict within transform.py * makes source code linter conform * updaes CD-pipeline to build and push docker image to GCR * now for reald cd and not ci * fixes CD pipeline permissions * pushes docker image to docker hub on deploy * fixes typo * adds env vars for docker image push * makes cd jobs parallel * tries to add github token to attestation step * quick fix: remove attestation step --------- Co-authored-by: Kevin <[email protected]> * Update dependency pydantic to v2.7.3 (#108) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency certifi to v2024.6.2 (#115) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency packaging to v24.1 (#126) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency pytest to v8.2.2 (#123) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency requests to v2.32.3 (#111) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency ruff to v0.4.8 (#109) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Swagger docs modified configuration (#133) * modified Swagger doc * added openapi to test deployment of swagger doc * Swagger docs (#136) * changed folder name 'doc' to 'docs' * Changed file directory names (#137) * added function to clean string from whitespaces and "\n" (#138) Co-authored-by: Frederick Engelns-Runte <[email protected]> * Swagger docs (#139) * relocated index.html * Swagger docs - fixed error in index.html (#140) * Update dependency ruff to v0.4.9 (#142) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency pydantic to v2.7.4 (#141) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --------- Co-authored-by: nilsbgt <[email protected]> Co-authored-by: Niyada <[email protected]> Co-authored-by: Kevin Stolz <[email protected]> Co-authored-by: Kevin <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Frederick Engelns-Bauer <[email protected]> Co-authored-by: Frederick Engelns-Runte <[email protected]> * Advance base model attributes * Eliminate flow ref * Cutting BPMNDIID, as ID is handled on BaseModel level. BPMNDiagram and BPMNDIObject now inherit from BPMNDINamespace directly * Handle BPMNLabel on Object level, planes can now also have a label * cuttoff/eliminate GenericIdNode, directly inherit BPMNNamespace to GenericBPMNNode, Also eliminate hash function in GenericBPMNNode, as it is standard self+id hash in BaseModel * Also inherit BPMNNamespace directl to flow... TODO Name inheritance * Eliminate arc id, as it can be inherited, leave the hash individualised * Inherit BaseModel directly in GenericNetNode * Inherit BaseModel directly to NetElement and Page * Eleminate standard hash in NetElement, as it is already implemented in BaseModel * Eliminate id in Net and Operator, as they inherit id from base model * Ruff fix * Cut GenericIdNode inheritance for message and time event * Fix GenericNode use, to BaseModel --------- Co-authored-by: nilsbgt <[email protected]> Co-authored-by: Niyada <[email protected]> Co-authored-by: Kevin Stolz <[email protected]> Co-authored-by: Kevin <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Frederick Engelns-Bauer <[email protected]> Co-authored-by: Frederick Engelns-Runte <[email protected]> Co-authored-by: Benjamin Bleidorn <[email protected]>
* remerge (#143) * Add Swagger UI (#128) * Wwi21/103 secure against xml vulnerabilities (#127) * adds env var for XML security to CI and CD pipeline * adds XML security env var to docker container * raise exception if xml var does not exist * Add secure xml package * fixes linting errors * Remove unnecessary tkinter import * tries to fix env var setting for CI pipeline * correctly sets FUNCTION_ENV_VARS in CD pipeline --------- Co-authored-by: Kevin Stolz <[email protected]> * Wwi21/33 building docker image for on prem deployment (#129) * Integrate transformer * implements matrix build * fixes typo * adds second function for integration * fixes test setup for multiple functions * fixes module issue for tests * adds boilerplate tests for transform endpoint * testing dependecy caching * upes to build in caching functionality for pip * extracts python version into env var * reenables linting in pipeline * fixes identation error * adds timestamp to gcf deployment name * makes definition of env variables the first step * added basic Docker file for dhbw server * makes source code linting conform * testing transform endpoint as module for gcp deployment * converts back to old imports * updates docker file to allow for transformer module import * fixes merge conflict within transform.py * makes source code linter conform * updaes CD-pipeline to build and push docker image to GCR * now for reald cd and not ci * fixes CD pipeline permissions * pushes docker image to docker hub on deploy --------- Co-authored-by: Kevin <[email protected]> * Wwi21/33 building docker image for on prem deployment (#130) * Integrate transformer * implements matrix build * fixes typo * adds second function for integration * fixes test setup for multiple functions * fixes module issue for tests * adds boilerplate tests for transform endpoint * testing dependecy caching * upes to build in caching functionality for pip * extracts python version into env var * reenables linting in pipeline * fixes identation error * adds timestamp to gcf deployment name * makes definition of env variables the first step * added basic Docker file for dhbw server * makes source code linting conform * testing transform endpoint as module for gcp deployment * converts back to old imports * updates docker file to allow for transformer module import * fixes merge conflict within transform.py * makes source code linter conform * updaes CD-pipeline to build and push docker image to GCR * now for reald cd and not ci * fixes CD pipeline permissions * pushes docker image to docker hub on deploy * fixes typo --------- Co-authored-by: Kevin <[email protected]> * Wwi21/33 building docker image for on prem deployment (#131) * Integrate transformer * implements matrix build * fixes typo * adds second function for integration * fixes test setup for multiple functions * fixes module issue for tests * adds boilerplate tests for transform endpoint * testing dependecy caching * upes to build in caching functionality for pip * extracts python version into env var * reenables linting in pipeline * fixes identation error * adds timestamp to gcf deployment name * makes definition of env variables the first step * added basic Docker file for dhbw server * makes source code linting conform * testing transform endpoint as module for gcp deployment * converts back to old imports * updates docker file to allow for transformer module import * fixes merge conflict within transform.py * makes source code linter conform * updaes CD-pipeline to build and push docker image to GCR * now for reald cd and not ci * fixes CD pipeline permissions * pushes docker image to docker hub on deploy * fixes typo * adds env vars for docker image push --------- Co-authored-by: Kevin <[email protected]> * Wwi21/33 building docker image for on prem deployment (#132) * Integrate transformer * implements matrix build * fixes typo * adds second function for integration * fixes test setup for multiple functions * fixes module issue for tests * adds boilerplate tests for transform endpoint * testing dependecy caching * upes to build in caching functionality for pip * extracts python version into env var * reenables linting in pipeline * fixes identation error * adds timestamp to gcf deployment name * makes definition of env variables the first step * added basic Docker file for dhbw server * makes source code linting conform * testing transform endpoint as module for gcp deployment * converts back to old imports * updates docker file to allow for transformer module import * fixes merge conflict within transform.py * makes source code linter conform * updaes CD-pipeline to build and push docker image to GCR * now for reald cd and not ci * fixes CD pipeline permissions * pushes docker image to docker hub on deploy * fixes typo * adds env vars for docker image push * makes cd jobs parallel * tries to add github token to attestation step --------- Co-authored-by: Kevin <[email protected]> * Wwi21/33 building docker image for on prem deployment (#134) * Integrate transformer * implements matrix build * fixes typo * adds second function for integration * fixes test setup for multiple functions * fixes module issue for tests * adds boilerplate tests for transform endpoint * testing dependecy caching * upes to build in caching functionality for pip * extracts python version into env var * reenables linting in pipeline * fixes identation error * adds timestamp to gcf deployment name * makes definition of env variables the first step * added basic Docker file for dhbw server * makes source code linting conform * testing transform endpoint as module for gcp deployment * converts back to old imports * updates docker file to allow for transformer module import * fixes merge conflict within transform.py * makes source code linter conform * updaes CD-pipeline to build and push docker image to GCR * now for reald cd and not ci * fixes CD pipeline permissions * pushes docker image to docker hub on deploy * fixes typo * adds env vars for docker image push * makes cd jobs parallel * tries to add github token to attestation step * quick fix: remove attestation step --------- Co-authored-by: Kevin <[email protected]> * Update dependency pydantic to v2.7.3 (#108) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency certifi to v2024.6.2 (#115) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency packaging to v24.1 (#126) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency pytest to v8.2.2 (#123) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency requests to v2.32.3 (#111) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency ruff to v0.4.8 (#109) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Swagger docs modified configuration (#133) * modified Swagger doc * added openapi to test deployment of swagger doc * Swagger docs (#136) * changed folder name 'doc' to 'docs' * Changed file directory names (#137) * added function to clean string from whitespaces and "\n" (#138) Co-authored-by: Frederick Engelns-Runte <[email protected]> * Swagger docs (#139) * relocated index.html * Swagger docs - fixed error in index.html (#140) * Update dependency ruff to v0.4.9 (#142) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency pydantic to v2.7.4 (#141) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --------- Co-authored-by: nilsbgt <[email protected]> Co-authored-by: Niyada <[email protected]> Co-authored-by: Kevin Stolz <[email protected]> Co-authored-by: Kevin <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Frederick Engelns-Bauer <[email protected]> Co-authored-by: Frederick Engelns-Runte <[email protected]> * Advance base model attributes * Eliminate flow ref * Cutting BPMNDIID, as ID is handled on BaseModel level. BPMNDiagram and BPMNDIObject now inherit from BPMNDINamespace directly * Handle BPMNLabel on Object level, planes can now also have a label * cuttoff/eliminate GenericIdNode, directly inherit BPMNNamespace to GenericBPMNNode, Also eliminate hash function in GenericBPMNNode, as it is standard self+id hash in BaseModel * Also inherit BPMNNamespace directl to flow... TODO Name inheritance * Eliminate arc id, as it can be inherited, leave the hash individualised * Inherit BaseModel directly in GenericNetNode * Inherit BaseModel directly to NetElement and Page * Eleminate standard hash in NetElement, as it is already implemented in BaseModel * Eliminate id in Net and Operator, as they inherit id from base model * Ruff fix * Cut GenericIdNode inheritance for message and time event * Fix GenericNode use, to BaseModel * BaseBPMNModel inherits BaseModel now... --------- Co-authored-by: nilsbgt <[email protected]> Co-authored-by: Niyada <[email protected]> Co-authored-by: Kevin Stolz <[email protected]> Co-authored-by: Kevin <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Frederick Engelns-Bauer <[email protected]> Co-authored-by: Frederick Engelns-Runte <[email protected]> Co-authored-by: Benjamin Bleidorn <[email protected]>
nilsbgt
added a commit
that referenced
this pull request
Jul 8, 2024
* update from main (#166) * get main (#168) * e2e test transformer * e2e test transformer * e2e test transformer * e2e test transformer * e2e test transformer * e2e test transformer * e2e test transformer * e2e tests * e2e tests# * e2e tests# * e2e tests# * changed data for bpmntopnml test * changed filepath * get main (#189) * test * test1 * test2 * added logger * added logger * try stdout * try print * wip: adds xml normalization for assertions * fixes e2e test assertion of xml * fix ruff errors * fix file input * remove integrationtest boilerplate code and refresh Tokens function * changed expected xml * xml beautiful * pnml_to_bpmn should work now * other direction test * fix bpmntopnml * sort xmls * fix file input --------- Co-authored-by: nils.baumgartner <[email protected]> Co-authored-by: Niyada <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.