searxng - ACL for hostPath + ixVolume migration #1688
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
stavros-k
force-pushed
the
acl-take-two
branch
from
cba9f1d to
bbf5d00
Compare
stavros-k
force-pushed
the
acl-take-two
branch
from
bd26788 to
cb5d192
Compare
stavros-k
commented
Oct 31, 2023
Comment on lines
131
to
138
| - variable: aclEntries | ||
| label: ACL Configuration | ||
| schema: | ||
| type: dict | ||
| show_if: [["aclEnable", "=", true]] | ||
| attrs: [] | ||
| $ref: | ||
| - "normalize/acl" |
There was a problem hiding this comment.
Hmm adding ACL entries here fails with key error (path)
Error: Traceback (most recent call last):
File "/usr/lib/python3/dist-packages/middlewared/job.py", line 426, in run
await self.future
File "/usr/lib/python3/dist-packages/middlewared/job.py", line 464, in __run_body
rv = await self.method(*([self] + args))
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/service/crud_service.py", line 194, in nf
rv = await func(*args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/schema/processor.py", line 44, in nf
res = await f(*args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/schema/processor.py", line 177, in nf
return await func(*args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/plugins/chart_releases_linux/chart_release.py", line 538, in do_update
config, context = await self.normalise_and_validate_values(
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/plugins/chart_releases_linux/chart_release.py", line 342, in normalise_and_validate_values
return await self.middleware.call(
^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/main.py", line 1398, in call
return await self._call(
^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/main.py", line 1341, in _call
return await methodobj(*prepared_call.args)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/plugins/chart_releases_linux/normalize_schema.py", line 42, in get_normalized_values
values[attr.name] = await self.normalize_question(attr, values[attr.name], update, values, context)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/plugins/chart_releases_linux/normalize_schema.py", line 55, in normalize_question
value[attr.name] = await self.normalize_question(
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/plugins/chart_releases_linux/normalize_schema.py", line 63, in normalize_question
value[index] = await self.normalize_question(attr, item, update, complete_config, context)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/plugins/chart_releases_linux/normalize_schema.py", line 55, in normalize_question
value[attr.name] = await self.normalize_question(
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/plugins/chart_releases_linux/normalize_schema.py", line 55, in normalize_question
value[attr.name] = await self.normalize_question(
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/plugins/chart_releases_linux/normalize_schema.py", line 66, in normalize_question
value = await self.middleware.call(
^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/main.py", line 1398, in call
return await self._call(
^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/main.py", line 1341, in _call
return await methodobj(*prepared_call.args)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/plugins/chart_releases_linux/normalize_schema.py", line 184, in normalize_acl
if not value or any(not value[k] for k in ('entries', 'path')):
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3/dist-packages/middlewared/plugins/chart_releases_linux/normalize_schema.py", line 184, in <genexpr>
if not value or any(not value[k] for k in ('entries', 'path')):
~~~~~^^^
KeyError: 'path'
There was a problem hiding this comment.
Okay had to remove $ref normalize/acl when its under a dict with $ref normalize/ixVolume
stavros-k
force-pushed
the
acl-take-two
branch
4 times, most recently
from
7606247 to
9dbad2c
Compare
stavros-k
force-pushed
the
acl-take-two
branch
from
a483559 to
c07f1f6
Compare
stavros-k
force-pushed
the
acl-take-two
branch
from
c07f1f6 to
18a188c
Compare
stavros-k
changed the title
stavros-k
force-pushed
the
storage-template-shim
branch
from
d060c0f to
5e8e793
Compare
stavros-k
force-pushed
the
acl-take-two
branch
2 times, most recently
from
69fcc64 to
cbea159
Compare
stavros-k
force-pushed
the
storage-template-shim
branch
from
f5f4390 to
4fa8f75
Compare
stavros-k
force-pushed
the
acl-take-two
branch
2 times, most recently
from
488d214 to
f1b687d
Compare
stavros-k
force-pushed
the
storage-template-shim
branch
from
4fa8f75 to
16a2da8
Compare
stavros-k
force-pushed
the
acl-take-two
branch
from
f1b687d to
57814f7
Compare
stavros-k
force-pushed
the
storage-template-shim
branch
from
16a2da8 to
bfac0c7
Compare
stavros-k
force-pushed
the
acl-take-two
branch
from
57814f7 to
cb03417
Compare
stavros-k
force-pushed
the
storage-template-shim
branch
from
bfac0c7 to
f2b7ad7
Compare
stavros-k
force-pushed
the
acl-take-two
branch
from
cb03417 to
1201f30
Compare
stavros-k
force-pushed
the
storage-template-shim
branch
from
f2b7ad7 to
9545c63
Compare
stavros-k
force-pushed
the
acl-take-two
branch
from
1201f30 to
5f362c0
Compare
stavros-k
force-pushed
the
storage-template-shim
branch
from
9545c63 to
9d32f5f
Compare
stavros-k
force-pushed
the
acl-take-two
branch
from
5f362c0 to
a89e628
Compare
stavros-k
force-pushed
the
acl-take-two
branch
4 times, most recently
from
ff15b5a to
111b5d2
Compare
sonicaj
approved these changes
Nov 23, 2023
stavros-k
force-pushed
the
acl-take-two
branch
from
111b5d2 to
13483aa
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.
A migration added under
migrationsdir for existing installations. Also a minor migration added in helm side, but that's only for CI, as we test upgrades with previous chart too. It can be safely removed on the next bump.Related:
truenas/catalog_validation#78
Maybe we should comment out aclEntries from schema for now, until the next Cobia release?
This should allow us to perform the migration on the rest of the apps, and will only need to uncomment it when the changes are in
After this is approved and finalized, I'll proceed updating/migrating the rest of the apps
Depends on #1702