Include auth model in OCI image #1212
Merged
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
babakks
approved these changes
May 10, 2024
Dockerfile
Outdated
| @@ -21,6 +21,7 @@ LABEL org.opencontainers.image.source=https://github.com/canonical/jimm | |||
| LABEL org.opencontainers.image.description="JIMM server container image" | |||
| RUN apt-get -qq update && apt-get -qq install -y ca-certificates postgresql-client | |||
| WORKDIR /root/ | |||
| COPY --from=build-env /usr/src/jimm/local/openfga/authorisation_model.json . | |||
There was a problem hiding this comment.
suggestion: I have a feeling that grouping OpenFGA-related files (which at the moment, it's just this one) in a separate directory (e.g., /openfga) could be beneficial some day in the future. What do you think?
There was a problem hiding this comment.
Yes that's a good idea, I'll make an openfga folder inside /root/
babakks
approved these changes
May 10, 2024
Dockerfile
Outdated
Comment on lines
24
to
27
| RUN mkdir ./openfga | ||
| COPY --from=build-env /usr/src/jimm/openfga/authorisation_model.json ./openfga/ | ||
| COPY --from=build-env /usr/src/jimm/jimmsrv . | ||
| COPY --from=build-env /usr/src/jimm/internal/dbmodel/sql ./sql/ |
There was a problem hiding this comment.
Do we need to mkdir? Because for the SQL files (the last line) it just works.
babakks
approved these changes
May 14, 2024
alesstimec
approved these changes
May 17, 2024
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.
Description
I'd like to propose an improvement to JIMM's deployment. The OpenFGA authorisation model is tightly coupled to JIMM's codebase i.e. there are several Go types defined based on the types in the auth model.
Currently the JIMM charm creates the auth model from user input, if the auth model supplied by the user is not the same as the one JIMM was tested against, things will break. This change would add the auth model as a file to the OCI image and in a separate PR to the charm, allow the charm to read the auth model and create it rather than using error-prone user input.
Fixes CSS-8463