valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
99,970 Commits 24 Branches 182 Tags 341 MiB
ac73745e15
Commit Graph

99970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
damianosSemmle
ac73745e15
Merge branch '2019.2' into fix-string-format-index 2019-02-12 10:18:09 +00:00
Daniel Wozniak
f446c52584
Merge pull request #51583 from dwoz/scriptfix 
Add testing path to run_script commands
 2019-02-11 14:38:50 -07:00
Daniel A. Wozniak
e49ba862cf
Add testing path to run_script commands 2019-02-11 14:13:25 -07:00
damianos
788f7e0742 Fixed string format index out of range error 
The string formats fixed where referencing index `{1}` when there was only one argument in the format call.
The string formats were changed to reference the correct index of `{0}`.

Disclaimer: I work for Semmle and I've found these errors using our LGTM code analyzer
https://lgtm.com/projects/g/saltstack/salt/alerts/?mode=tree&severity=error&lang=python&ruleFocus=9990090
 2019-02-06 15:07:29 +00:00
Daniel Wozniak
c3e27bef82
Merge pull request #51405 from aplanas/backport_49669 
Documentation: fix typo in "equivalent"
 2019-02-01 14:11:11 -07:00
Daniel Wozniak
5c26652bb3
Merge pull request #51406 from aplanas/backport_49670 
states_pt3: fix rST link format
 2019-02-01 14:10:42 -07:00
Daniel Wozniak
204432d924
Merge branch '2019.2' into backport_49670 2019-02-01 14:10:22 -07:00
Daniel Wozniak
fb70bd377b
Merge pull request #51426 from aplanas/backport_51135 
mount: cache blkid information
 2019-02-01 14:09:50 -07:00
Daniel Wozniak
2e8bf0589c
Merge pull request #51425 from aplanas/backport_51094 
cmdmod: add sysfs into the chroot
 2019-02-01 14:08:59 -07:00
Daniel Wozniak
d7a47f0727
Merge pull request #51419 from aplanas/backport_50607 
file: update attributes for lsattr and chattr
 2019-02-01 14:04:53 -07:00
Daniel Wozniak
7e020ddda3
Merge pull request #51414 from aplanas/backport_50396 
service: SUSE is not based on sysvinit anymore
 2019-02-01 14:02:32 -07:00
Daniel Wozniak
9f87dda02c
Merge pull request #51408 from aplanas/backport_49804 
parted: fix the ordering of list command
 2019-02-01 14:00:18 -07:00
Daniel Wozniak
7e14499244
Merge pull request #51410 from aplanas/backport_50126 
Fix lowpkg.diff documentation and parameter name
 2019-02-01 13:57:49 -07:00
Pedro Algarvio
6f0d4076e1
Actually, remove python-ldap. It needs system deps. Have salt-jenkins do it. 2019-02-01 16:37:14 +00:00
Pedro Algarvio
cc94dab469
Fix the ldap pacakge name in requirements/tests.txt 2019-02-01 16:23:48 +00:00
Gareth J. Greenaway
ac790a6e36
Merge branch '2019.2' into backport_51135 2019-01-31 10:27:19 -08:00
Alberto Planas
e61a0779d4 states_pt3: fix rST link format 
(cherry picked from commit f6ae0123e1)
 2019-01-31 10:53:54 +01:00
Alberto Planas
58279b4211 Documentation: fix typo in "equivalent" 
(cherry picked from commit a91676c2d5)
 2019-01-31 10:53:14 +01:00
Daniel Wozniak
a16461b1ba
Merge pull request #51404 from aplanas/backport_49668 
blockdev: fix url from comment
 2019-01-30 13:05:53 -07:00
Daniel Wozniak
756c367c6b
Merge pull request #51407 from aplanas/backport_49803 
parted: fix _validate_partition_boundary
 2019-01-30 13:05:01 -07:00
Daniel Wozniak
1d45664211
Merge pull request #51435 from damianosSemmle/fix-raise-exception 
Fixed not raised exceptions
 2019-01-30 11:32:56 -07:00
damianos
7a9ff59309 Fixed not raised exceptions 
Raised 11 exceptions `CommandExecutionError` in `salt/modules/panos.py` and 1 exception `SaltInvocationError` in `salt/modules/win_dsc.py` that were called but not raised.

I work for Semmle and I noticed the bug with out LGTM code analyzer
https://lgtm.com/projects/g/saltstack/salt/alerts/?mode=tree&severity=error&lang=python&ruleFocus=1505923886371
 2019-01-30 16:06:07 +00:00
Alberto Planas
467daf2e4c parted: support variable length output for print 
The command print from parted have a variable lenght output,
depending on the units requested, or the kind of partition.

This patch add the logic to support the full range of outputs
that parted 3.1, and early versions, are generating.

(cherry picked from commit 5adf859e3f)
 2019-01-30 13:44:27 +01:00
Alberto Planas
66743d6502 mount: cache blkid information 
During the mount of a device a call to blkid is done, to get
information of the current devices.

blkid is a slow operation, to avoid that use an internal cache,
that is specified in /etc/blkid configuration file, but a single
blkid can still redo this cache file, making the second call
equally slow.

This patch cache the blkid information for _active_mountinfo in
the __context__ dict, making the next mount action a fast
operation.

(cherry picked from commit c1ede1d97c)
 2019-01-30 13:17:33 +01:00
Alberto Planas
9193106c50 cmdmod: add sysfs into the chroot 
Some commands executed inside the chroot require access to the /sys
information. For example, /sys/firmware is used to get to information
from UEFI systems.

This patch mount a sysfs file system inside the chroot.

Also normalize the name for devtmpfs, replacing the old udev one.

(cherry picked from commit 2b5d45ac99)
 2019-01-30 13:15:50 +01:00
Pedro Algarvio
b92713c851
Coverage on windows chokes with the tox env var COVERAGE_PROCESS_START 2019-01-30 11:49:20 +00:00
Pedro Algarvio
55878672ea
Switch required PyTest dependency 2019-01-30 11:49:17 +00:00
Alberto Planas
ab8a8b84b1 file: update attributes for lsattr and chattr 
(cherry picked from commit 1be76ec291)
 2019-01-30 11:51:29 +01:00
Alberto Planas
b5cff17f77 service: SUSE is not based on sysvinit anymore 
(cherry picked from commit dd1ec387bb)
 2019-01-30 11:38:24 +01:00
Alberto Planas
d38622e7ed Fix lowpkg.diff documentation and parameter name 
Package names are useless for lowpkg.diff, as to make a full
comparison we need to access the RPM

Fix #50097

(cherry picked from commit 5484791c0f)
 2019-01-30 11:16:14 +01:00
Alberto Planas
da2e632566 parted: fix the ordering of list command 
The command `parted -m -s {} print` do not print the "Type" column,
but after the "File System" column print the name of the partition.

This point that the type of the partition cannot be extracted using
parted with machine parseable output.

(cherry picked from commit f23d618e11)
 2019-01-30 11:02:26 +01:00
Alberto Planas
b004b33444 parted: fix _validate_partition_boundary 
The current partition boundary validator checks that one of the
valid units is a suffix of the boundary, and if so consider it
a valid one. This validation have two problems:

* We can miss the numerical part of the boundary

  e.g: 's' or 'MB' will be valid units

* The unit provided can be invalid

  e.g: '10as', '1okB'

The current validator make sure that there is a valid number
and a valid unit in the boundary.

(cherry picked from commit 9e5a0fe676)
 2019-01-30 10:59:41 +01:00
Alberto Planas
da2e30dfce blockdev: fix url from comment 
(cherry picked from commit 4a2fd4c615)
 2019-01-30 10:41:16 +01:00
Daniel Wozniak
d4b90933ac
Merge pull request #51336 from Ch3LL/merge-2019.2.0rc1 
[2019.2] Merge Forward from 2019.2.0.rc1 to 2019.2
 2019-01-27 16:55:08 -07:00
Daniel Wozniak
02b43a09fb
Merge pull request #51334 from Ch3LL/merge-2019.2 
[2019.2] Merge forward from 2018.3 to 2019.2
 2019-01-27 16:49:31 -07:00
Pedro Algarvio
62a20b1917
Remove unused import 2019-01-27 20:34:06 +00:00
Gareth J. Greenaway
2284ea5162
Merge branch '2019.2' into merge-2019.2.0rc1 2019-01-25 11:30:27 -08:00
Ch3LL
18bf2369f8
Merge branch '2019.2.0.rc1' into 2019.2 
Conflicts:
  - salt/modules/win_lgpo.py
 2019-01-25 14:27:17 -05:00
Pedro Algarvio
95607d17db
Merge pull request #51314 from s0undt3ch/features/tox-runtests-2019.2 
[2019.2] Allow running runtests.py using tox
 2019-01-25 18:56:00 +00:00
Ch3LL
25ec653fd4
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - .codecov.yml
  - salt/modules/artifactory.py
 2019-01-25 13:19:07 -05:00
Megan Wilhite
c11838757e
Merge pull request #50974 from max-arnold/salt-call-executor-options 
[Fluorine] Unify salt-call/salt executor arguments
 2019-01-25 09:42:31 -05:00
Megan Wilhite
b49ac1e7ec
Merge pull request #51300 from twangboy/merge_context 
Bring __context__ usage in LGPO to rc1
 2019-01-25 09:21:13 -05:00
Pedro Algarvio
39fb981faa
"Tell" coverage to track subprocesses. 2019-01-25 13:03:26 +00:00
Pedro Algarvio
f62cc11d78
Merge pull request #51324 from garethgreenaway/1257_something_something_bytes_argh_python2 
[2018.3] Fixes to x509 module and test
 2019-01-25 09:34:59 +00:00
Pedro Algarvio
bd7072f3c8
Merge branch '2018.3' into 1257_something_something_bytes_argh_python2 2019-01-25 09:34:49 +00:00
Pedro Algarvio
b44cd84cb2
Merge pull request #51323 from garethgreenaway/network_dns_check_test 
[2018.3] Adding a test to ensure dns_check works as expected.
 2019-01-25 09:28:16 +00:00
Pedro Algarvio
055eadc1c0
Merge branch '2018.3' into network_dns_check_test 2019-01-25 09:28:00 +00:00
Daniel Wozniak
be57a0f55c
Merge pull request #51321 from terminalmage/issue51256 
Fix 500 error when using wheel_async
 2019-01-24 20:51:34 -07:00
Gareth J. Greenaway
0e542c5515
Fixing various bits in x509 module and unit test to ensure tests are passing on python2 & python3 2019-01-24 16:41:49 -08:00
Pedro Algarvio
f27589aff7
Remove unused imports 2019-01-24 23:21:00 +00:00