Thanks to visit codestin.com
Credit goes to github.com

Skip to content

new feature: refactor server-side PKI #67799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 11, 2025
Merged

new feature: refactor server-side PKI #67799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
851ec6a
add missing ReqClient _closing var
mattp- Feb 28, 2025
8227824
fix error handling on prep jid failure
mattp- Feb 28, 2025
cdc71e4
new feature: refactor server-side PKI
mattp- Jan 6, 2025
7808cc3
migrate remaining master side pki to cache
mattp- May 14, 2025
0a94154
remove tests/pytests/unit/crypt/test_crypt_cryptodome.py
mattp- May 15, 2025
8c50ec3
fix tests from pki refactor
mattp- May 16, 2025
da6e3a3
push salt.utils.minions bits into salt.key / optimize matching
mattp- May 22, 2025
d09346a
check_compound_minions: defer _pki_minions fetch
mattp- Jun 13, 2024
e26f86a
update towncrier template for multi-line entry
mattp- May 27, 2025
0c536b8
review from @dwoz : rename to localfs_key
mattp- Jun 2, 2025
5b18d4c
address review from @dwoz
mattp- Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion changelog/.template.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@
### {{ definitions[category]['name'] }}

{% for text, values in sections[""][category].items() %}
- {{ text }} {{ values|join(', ') }}
{% set lines = text.split('\n') %}
{% for line in lines %}
{% if line.startswith('- ') %}
{{ line | trim }} {{ values|join(', ') }}
{% else %}
- {{ line | trim }} {{ values|join(', ') }}
{% endif %}
{% endfor %}
{% endfor %}

{% endfor %}
Expand Down
3 changes: 3 additions & 0 deletions changelog/67799.added.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
refactored server-side PKI to support cache interface
optimization: check_compound_minions: defer _pki_minions fetch
refactor: push salt.utils.minions bits into salt.key / optimize matching
1 change: 1 addition & 0 deletions doc/ref/cache/all/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ For understanding and usage of the cache modules see the :ref:`cache` topic.
consul
etcd_cache
localfs
localfs_key
mysql_cache
redis_cache
5 changes: 5 additions & 0 deletions doc/ref/cache/all/salt.cache.localfs_key.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
salt.cache.localfs_key
=================================

.. automodule:: salt.cache.localfs_key
:members:
7 changes: 6 additions & 1 deletion salt/auth/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import salt.utils.network
import salt.utils.user
import salt.utils.versions
from salt.utils.decorators import cached_property

log = logging.getLogger(__name__)

Expand Down Expand Up @@ -60,7 +61,11 @@ def __init__(self, opts, ckminions=None):
self.max_fail = 1.0
self.auth = salt.loader.auth(opts)
self.tokens = salt.loader.eauth_tokens(opts)
self.ckminions = ckminions or salt.utils.minions.CkMinions(opts)
self._ckminions = ckminions

@cached_property
def ckminions(self):
return self._ckminions or salt.utils.minions.CkMinions(self.opts)

def load_name(self, load):
"""
Expand Down
4 changes: 3 additions & 1 deletion salt/cache/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ def __init__(self, opts, cachedir=None, **kwargs):
self.cachedir = opts.get("cachedir", salt.syspaths.CACHE_DIR)
else:
self.cachedir = cachedir
self.driver = opts.get("cache", salt.config.DEFAULT_MASTER_OPTS["cache"])
self.driver = kwargs.get(
"driver", opts.get("cache", salt.config.DEFAULT_MASTER_OPTS["cache"])
)
self._modules = None
self._kwargs = kwargs
self._kwargs["cachedir"] = self.cachedir
Expand Down
Loading
Loading