[2019.2] Merge Forward from 2019.2.0.rc1 to 2019.2 #51336

Ch3LL · 2019-01-25T19:29:46Z

Conflicts:

salt/modules/win_lgpo.py

GitPython==2.1.10 CherryPy==17.4.1

Fix pylint for 2019.2

Skip test_get_file_templated_paths on Windows/Py3

Update dependencies in req.txt for Windows

Update dependencies in req.txt for OSX

…nctions.

Some code in salt._compat which checks if the value is a packed binary representation of an IPv6 address fails if the value passed is not a bytestring (i.e. a `unicode` type on PY2 or `str` type on PY3). This fixes that code when the minion ID is a 16-character string (not a bytestring). Note that the minion ID will never be a bytestring as of 2018.3.0, so this affects any 16-character minion ID when the minion ID is checked to see if it is really an IP address.

Bring auditpol support to rc1

Backport saltstack#51285 into 2019.2.0.rc1

Fix edge case when minion ID is a 16-character string

…valid, so we strip anything else out.

…low_auth_valid_parameters [2019.2.0rc1] Fix to __auth_call

Bring __context__ usage in LGPO to rc1

…-options [Fluorine] Unify salt-call/salt executor arguments

Conflicts: - salt/modules/win_lgpo.py

codecov · 2019-01-25T19:46:06Z

Codecov Report

Merging #51336 into 2019.2 will increase coverage by 12.48%.
The diff coverage is 57.77%.

@@             Coverage Diff             @@
##           2019.2   #51336       +/-   ##
===========================================
+ Coverage   36.42%    48.9%   +12.48%     
===========================================
  Files        1531     1574       +43     
  Lines      254237   269104    +14867     
  Branches    52471    58011     +5540     
===========================================
+ Hits        92607   131617    +39010     
+ Misses     151307   137194    -14113     
+ Partials    10323      293    -10030

Flag	Coverage Δ
#arch	`19.89% <17.77%> (?)`
#centos7	`32.38% <38.63%> (-4.05%)`	⬇️
#debian8	`45.4% <53.33%> (?)`
#fedora28	`45.48% <53.33%> (?)`
#py2	`32.61% <40%> (-3.81%)`	⬇️
#py3	`32.62% <38.63%> (?)`
#ubuntu1804	`32.19% <38.63%> (?)`

Impacted Files	Coverage Δ
salt/modules/win_lgpo.py	`35.85% <ø> (+29.64%)`	⬆️
salt/states/win_lgpo.py	`36.91% <0%> (+28.18%)`	⬆️
salt/auth/__init__.py	`27.42% <100%> (ø)`
salt/_compat.py	`30.84% <100%> (-10.45%)`	⬇️
salt/cli/caller.py	`17.88% <50%> (-31.79%)`	⬇️
salt/utils/win_lgpo_auditpol.py	`52.3% <52.3%> (+18.46%)`	⬆️
salt/modules/win_auditpol.py	`71.42% <71.42%> (+7.14%)`	⬆️
salt/utils/win_lgpo_netsh.py	`46.77% <80%> (+26.61%)`	⬆️
salt/cli/spm.py	`0% <0%> (-100%)`	⬇️
salt/log/__init__.py	`0% <0%> (-100%)`	⬇️
... and 1479 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 95607d1...2284ea5. Read the comment docs.

max-arnold and others added 30 commits December 24, 2018 11:43

Unify salt-call/salt executor arguments

f7f0d3a

Update dependencies in req.txt for Windows

3edfef3

Update dependencies in req.txt for OSX

ea0acba

Downgrade CherryPy to 17.4.1

ab38f89

Rollback GitPython to 2.1.10

8d8a15c

Rollback two dependencies

dcc74f2

GitPython==2.1.10 CherryPy==17.4.1

Backport pyobjc

c646989

Rollback zeromq to 4.1.6

1d00b05

Merge forward saltstack#51154 and saltstack#51184

35adc8b

Merge branch '2019.2.0.rc1' into merge_auditpol

1b83427

Fix pylint for 2019.2

1dd92a9

Merge pull request saltstack#51283 from Ch3LL/lint_2019

2cc617a

Fix pylint for 2019.2

Skip test_getI_file_templated_paths on Windows/Py3

9464af2

Merge pull request saltstack#51286 from twangboy/skip_test_cp

eab0a2a

Skip test_get_file_templated_paths on Windows/Py3

Merge branch '2019.2.0.rc1' into update_req_windows

7a05c19

Merge pull request saltstack#51175 from twangboy/update_req_windows

411d682

Update dependencies in req.txt for Windows

Merge branch '2019.2.0.rc1' into update_req_osx

d4d401b

Merge pull request saltstack#51176 from twangboy/update_req_osx

8850b37

Update dependencies in req.txt for OSX

Ensure metadata is an accepted keyword argument for authentication fu…

6e869d0

…nctions.

Merge pull request saltstack#51223 from twangboy/merge_auditpol

7fa0421

Bring auditpol support to rc1

Use __context__ in LGPO module

3ed7b84

Merge pull request saltstack#51296 from Ch3LL/bp-51285

cd5b503

Backport saltstack#51285 into 2019.2.0.rc1

Merge branch '2019.2.0.rc1' into issue51258

f94e721

Merge pull request saltstack#51298 from terminalmage/issue51258

d6f4f05

Fix edge case when minion ID is a 16-character string

Merge branch '2019.2.0.rc1' into salt-call-executor-options

a57b1e2

Merge branch '2019.2.0.rc1' into merge_context

9d487f2

When making auth calls, only username, password, auth, and token are …

3dbe8dc

…valid, so we strip anything else out.

Merge pull request saltstack#51318 from garethgreenaway/51273_only_al…

0af4675

…low_auth_valid_parameters [2019.2.0rc1] Fix to __auth_call

Merge pull request saltstack#51300 from twangboy/merge_context

b49ac1e

Bring __context__ usage in LGPO to rc1

Ch3LL added 2 commits January 25, 2019 09:42

Merge pull request saltstack#50974 from max-arnold/salt-call-executor…

c118387

…-options [Fluorine] Unify salt-call/salt executor arguments

Merge branch '2019.2.0.rc1' into 2019.2

18bf236

Conflicts: - salt/modules/win_lgpo.py

Ch3LL requested a review from a team as a code owner January 25, 2019 19:29

garethgreenaway approved these changes Jan 25, 2019

View reviewed changes

Merge branch '2019.2' into merge-2019.2.0rc1

2284ea5

Remove unused import

62a20b1

dwoz approved these changes Jan 27, 2019

View reviewed changes

dwoz merged commit d4b9093 into saltstack:2019.2 Jan 27, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[2019.2] Merge Forward from 2019.2.0.rc1 to 2019.2 #51336

[2019.2] Merge Forward from 2019.2.0.rc1 to 2019.2 #51336

Ch3LL commented Jan 25, 2019

codecov bot commented Jan 25, 2019

[2019.2] Merge Forward from 2019.2.0.rc1 to 2019.2 #51336

[2019.2] Merge Forward from 2019.2.0.rc1 to 2019.2 #51336

Conversation

Ch3LL commented Jan 25, 2019

codecov bot commented Jan 25, 2019

Codecov Report