Merge branch 'develop' into 1.1 - #15
Merged
Merged
Conversation
…s table. The API builds these tables with create_all, which never adds a column to an existing one, so the seed job adds the column itself before inserting rather than failing on an environment seeded before this field existed.
… in master-data-api, trailing whitespace in codelist SQL seeds, missing final newlines in UI files, README and .gitignore); formatting only, no functional change
Supersedes the 'moved to GitLab' note; the tree is GitLab's develop.
Restores the GitHub Actions caller and removes the GitLab pipeline. Images go back to Docker Hub, where the previous versions already sit, and the chart values and dependency repository pointed at GitLab and now point at Docker Hub and openg2p-helm.
The dependency's repository moved to openg2p-helm but its version stayed at 0.0.0-develop.57, which only ever existed in the GitLab registry, so helm dep up could not resolve it and the chart job failed. Now 0.0.0-develop.60, the version keycloak-init published after its own move.
master-data-api crashed on boot with:
File "iam_core/user_auth/app.py", line 8, in <module>
from openg2p_fastapi_common.crypto import CryptoFactory
ModuleNotFoundError: No module named 'openg2p_fastapi_common.crypto'
The image installs both libraries from git. IAM_SERVICE_REF was pinned to
1.4 on 21 Aug, and iam-core 1.4 imports openg2p_fastapi_common.crypto --
but FASTAPI_COMMON_REF was left at develop, which has no crypto module.
The crypto package (G2P-5581, centralised crypto/key management) lives on
the fastapi-common 1.2 line, so the two refs were a line apart.
Pin fastapi-common to 1.2, matching what partner-management already does.
Checked before switching:
* master-data-api imports only app, context, controller, models, ping,
schemas and service from openg2p_fastapi_common -- all present on 1.2
* it uses none of the packages 1.2 removes (openg2p-fastapi-auth,
-auth-models, -partner-auth)
* all nine symbols iam-core 1.4 needs resolve on 1.2
* the only commits develop has over 1.2 are README edits, so nothing is
given up by moving off develop
Merging 1.2 into develop would be the wrong fix: 1.2 deletes those three
auth packages, and g2p-bridge, spar and pbms all install them from
develop, so their images would stop building.
…ckerfile The previous commit changed the Dockerfile's ARG default to 1.2, but that had no effect on the published image: the caller declares a 'pins' entry for FASTAPI_COMMON_REF, which openg2p-packaging resolves to a SHA and passes as a --build-arg, overriding the Dockerfile default. The pin still said 'develop', so master-data-api 0.0.0-develop.67 was still built against fastapi-common develop and kept crash-looping on ModuleNotFoundError: No module named 'openg2p_fastapi_common.crypto' Point the pin at 1.2, matching iam-core 1.4 and the Dockerfile default. The Dockerfile ARG stays at 1.2 so local builds match CI.
Bring latest develop changes into the 1.1 release line.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.