On-prem: read blueprints from disk (COMPOSER-2413) #2603
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
lucasgarfield
force-pushed
the
cockpit_fileapi
branch
from
de7c995 to
dcbf410
Compare
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
from
dcbf410 to
091ff7d
Compare
|
I can't wait to see this in action! I'm trying to get it running locally but can't get anything to appear in Cockpit. I noticed quite a few changes to the makefile... what should I do to get this to run? |
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
from
091ff7d to
12f3c12
Compare
Oh right, so we need to pull in some of the cockpit dependencies. Try |
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
5 times, most recently
from
2e17a88 to
dadbaec
Compare
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
2 times, most recently
from
6983959 to
85f4c58
Compare
Codecov ReportAttention: Patch coverage is
@@ Coverage Diff @@
## main #2603 +/- ##
==========================================
- Coverage 85.28% 85.04% -0.25%
==========================================
Files 180 183 +3
Lines 20519 20588 +69
Branches 2002 2002
==========================================
+ Hits 17500 17509 +9
- Misses 2997 3057 +60
Partials 22 22
Continue to review full report in Codecov by Sentry.
|
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
2 times, most recently
from
c73c587 to
8dd626a
Compare
lucasgarfield
force-pushed
the
cockpit_fileapi
branch
from
8dd626a to
b85d924
Compare
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
7 times, most recently
from
3640100 to
71de59a
Compare
|
I had to change some typescript config which made this PR a lot bigger. I think if we want to go ahead with this, it would probably be better to split the typescript changes into a separate PR. |
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
from
71de59a to
ad92853
Compare
lucasgarfield
changed the title
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
from
ad92853 to
c14634f
Compare
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
7 times, most recently
from
76e95e9 to
d831f5b
Compare
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
4 times, most recently
from
7ef321a to
4b9333a
Compare
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
2 times, most recently
from
7f1ac45 to
6e579ed
Compare
lucasgarfield
force-pushed
the
cockpit_fileapi
branch
from
6e579ed to
2e909e0
Compare
|
/retest |
This is just to follow the convention already used in the project.
The on-prem version of this repo depends on the `cockpit` project. Some of the files from the `cockpit` repo are needed to build and run this project. These files are saved into the `pkg/lib` directory, this commit adds some convenience scripts to the Makefile to do this.
Limit the cockpit workaround to only delete the `cockpit` directory at the root of the project. Otherwise this command would delete some of the mocks that we need to compile the project.
Add some stub functions for the cockpit library, these will be needed for tests to pass and for stubbing out the library for the service.
It was necessary to do a bit of plumbing to get typescript, webpack & vitest all happy. To do this we had had to create a separate tsconfig for the on-prem version and the service frontend. We override the module resolution for both config files. For on-prem we check modules in `pkg/lib` and for the service we resolve the modules to stub functions of the `cockpit` & `cockpit/fsinfo` modules. This was so typescript and webpack would not complain. For on-prem we had to intruct webpack to resolve modules from both `node_modules` and `pkg/lib`. While for the service we set the resulotion for the two modules to false, which means they won't get bundled with the service. Lastly, we needed to set some aliases in the vitest config so that vitest could resolve the `cockpit` & `cockpit/fsinfo` modules. Using the cjs `require` keyword to import cockpit would have worked to make typescript and webpack compile since these imports are not statically analysed like the `import` keyword is. However, this approach broke the tests as `require` imports are not supported in vitest.
Add an initial commit to scan a preset directory for user blueprint files. This makes use of the cockpit files api.
Use the blueprint existing blueprint converter to convert the on-prem blueprint to the hosted blueprint
kingsleyzissou
force-pushed
the
cockpit_fileapi
branch
from
2e909e0 to
df9970c
Compare
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.
We can use the cockpit files api to read in blueprints from disk.
This PR adds commits to bring in the required dependencies, some convenience scripts and an initial commit using an RTK query function to read blueprints from file and pull the details into the store.