saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #46720 from rallytime/bump-nacl-deprecation

Browse source 
Bump deprecation notices in nacl module & runner to Neon
This commit is contained in:
Nicole Thomas 2018-03-27 17:15:45 -04:00 • committed by GitHub
commit 65bb37effd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/topics/releases/2018.3.0.rst
View file

@ -1627,9 +1627,9 @@ NaCL Module and Runner changes
------------------------------
In addition to argument changes in both the NaCL module and runner for future
deprecation in the Fluorine release, the default box_type has changed from
`secretbox` to `sealedbox`. SecretBox is data encrypted using private key
`sk` and Sealedbox is encrypted using public key `pk`
removal in the Neon release, the default "box_type" has changed from
``secretbox`` to ``sealedbox``. SecretBox is data encrypted using private key
``sk`` and Sealedbox is encrypted using public key ``pk``.
Deprecations
------------

11
salt/modules/nacl.py
View file

@ -161,6 +161,7 @@ import salt.syspaths
import salt.utils.files
import salt.utils.platform
import salt.utils.stringutils
import salt.utils.versions
import salt.utils.win_functions
import salt.utils.win_dacl
@ -254,7 +255,7 @@ def keygen(sk_file=None, pk_file=None, **kwargs):
'''
if 'keyfile' in kwargs:
salt.utils.versions.warn_until(
'Fluorine',
'Neon',
'The \'keyfile\' argument has been deprecated and will be removed in Salt '
'{version}. Please use \'sk_file\' argument instead.'
)
@ -322,7 +323,7 @@ def enc(data, **kwargs):
'''
if 'keyfile' in kwargs:
salt.utils.versions.warn_until(
'Fluorine',
'Neon',
'The \'keyfile\' argument has been deprecated and will be removed in Salt '
'{version}. Please use \'sk_file\' argument instead.'
)
@ -330,7 +331,7 @@ def enc(data, **kwargs):
if 'key' in kwargs:
salt.utils.versions.warn_until(
'Fluorine',
'Neon',
'The \'key\' argument has been deprecated and will be removed in Salt '
'{version}. Please use \'sk\' argument instead.'
)
@ -388,7 +389,7 @@ def dec(data, **kwargs):
'''
if 'keyfile' in kwargs:
salt.utils.versions.warn_until(
'Fluorine',
'Neon',
'The \'keyfile\' argument has been deprecated and will be removed in Salt '
'{version}. Please use \'sk_file\' argument instead.'
)
@ -399,7 +400,7 @@ def dec(data, **kwargs):
if 'key' in kwargs:
salt.utils.versions.warn_until(
'Fluorine',
'Neon',
'The \'key\' argument has been deprecated and will be removed in Salt '
'{version}. Please use \'sk\' argument instead.'
)

11
salt/runners/nacl.py
View file

@ -121,6 +121,7 @@ import os
import salt.utils.files
import salt.utils.platform
import salt.utils.stringutils
import salt.utils.versions
import salt.utils.win_functions
import salt.utils.win_dacl
import salt.syspaths
@ -219,7 +220,7 @@ def keygen(sk_file=None, pk_file=None, **kwargs):
if 'keyfile' in kwargs:
salt.utils.versions.warn_until(
'Fluorine',
'Neon',
'The \'keyfile\' argument has been deprecated and will be removed in Salt '
'{version}. Please use \'sk_file\' argument instead.'
)
@ -288,7 +289,7 @@ def enc(data, **kwargs):
if 'keyfile' in kwargs:
salt.utils.versions.warn_until(
'Fluorine',
'Neon',
'The \'keyfile\' argument has been deprecated and will be removed in Salt '
'{version}. Please use \'sk_file\' argument instead.'
)
@ -296,7 +297,7 @@ def enc(data, **kwargs):
if 'key' in kwargs:
salt.utils.versions.warn_until(
'Fluorine',
'Neon',
'The \'key\' argument has been deprecated and will be removed in Salt '
'{version}. Please use \'sk\' argument instead.'
)
@ -353,7 +354,7 @@ def dec(data, **kwargs):
'''
if 'keyfile' in kwargs:
salt.utils.versions.warn_until(
'Fluorine',
'Neon',
'The \'keyfile\' argument has been deprecated and will be removed in Salt '
'{version}. Please use \'sk_file\' argument instead.'
)
@ -364,7 +365,7 @@ def dec(data, **kwargs):
if 'key' in kwargs:
salt.utils.versions.warn_until(
'Fluorine',
'Neon',
'The \'key\' argument has been deprecated and will be removed in Salt '
'{version}. Please use \'sk\' argument instead.'
)