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
59,620 Commits 24 Branches 182 Tags 341 MiB
cc34a57ffe
Commit Graph

5788 Commits

Author SHA1 Message Date
Nicole Thomas
e103f53b4f Merge pull request #27485 from lyft/boto-asg-scheduled-actions 
Add scheduled actions (like scaleup/scaledown actions) to boto_asg
 2015-10-01 09:18:19 -06:00
Ryan Lane
714a93900b Patch config.option 2015-09-30 10:04:10 -07:00
Colton Myers
41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/rest_service.py
    salt/states/dockerng.py
    salt/utils/cloud.py
 2015-09-29 18:13:33 -06:00
Justin Anderson
0e37fb3bd3 Merge pull request #27513 from terminalmage/fix-worktree-tests 
Fix integration tests for worktree addition in git >= 2.6
 2015-09-29 12:39:19 -06:00
Nicole Thomas
e974a3c8aa Merge pull request #27510 from rallytime/ryan-lane-test-fix 
Merge #27475 with test fixes
 2015-09-29 12:34:32 -06:00
Erik Johnson
519bdd6438 Fix integration tests for worktree addition in git >= 2.6 
The output from 'git worktree add' changed slightly in 2.6.
 2015-09-29 12:01:45 -05:00
rallytime
cae2c4e715 Syntax fix 2015-09-29 10:02:16 -06:00
rallytime
458547ba03 Fix test failures for boto __state__ changes 2015-09-29 09:55:44 -06:00
Mike Place
d85b0cbd69 Merge pull request #27451 from ticosax/dockerng-host-config-support 
[dockerng] Enforce usage of host_config and require docker-py>=1.4.0
 2015-09-29 09:51:28 -06:00
Nicolas Delaby
fadd9bd43e Add test to check we don't call inspect_image on absent images. 2015-09-29 15:53:29 +02:00
Nicolas Delaby
b184faa55b Enforce usage of host_config and require docker-py>=1.4.0 2015-09-28 23:24:57 +02:00
Mike Place
7d0512406b Merge pull request #27464 from cachedout/lint_27365 
Lint 27365
 2015-09-28 12:38:26 -06:00
Nicolas Delaby
a1ed6cda56 Skip test if docker-py is not installed 2015-09-28 19:53:10 +02:00
Mike Place
74095b6b22 Lint 2015-09-28 11:48:51 -06:00
Nicolas Delaby
cc8471bd1b dockerpy expect only command argument not cmd 2015-09-28 10:08:40 -05:00
Matti Niemenmaa
8eb5036f1f states.file: allow prepending to non-existent file (#27401) 
Remove the redundant file.touch invocation also from file.append, to
simplify the flow.
 2015-09-27 09:06:51 +03:00
justinta89
fd0dedeb99 Skipping Async tests 
Skipping the transport async tests until we can devote more time to fixing the
test failures associated with them.
 2015-09-24 13:41:58 -06:00
Daniel Hobley
f972c39333 Lint fixes 2015-09-24 12:41:56 +02:00
Daniel Hobley
40db871e2b Added the ability to trim the returned files from an unzip 
- This reduces log spamming when you unzip thousands of files, it defaults to off
 2015-09-24 11:43:21 +02:00
Thomas S Hatch
d37afd1be8 Add rand-ver option 2015-09-23 16:09:23 -06:00
Thomas S Hatch
d5c23bdf8a Allow the minion swarm to generate random minion OSES 2015-09-23 15:59:55 -06:00
Mike Place
23fcc9e348 Merge pull request #27248 from tinyclues/better_cors_headers 
[Saltnado] - The CORS implementation was a bit naive about headers allowance.
 2015-09-23 08:50:06 -06:00
Mike Place
3933eed307 Merge pull request #27249 from tinyclues/login_support_more_content_type 
[Saltnado] - Add the support of login payload in JSON and YAML.
 2015-09-23 08:49:42 -06:00
Mike Place
f63f4d8c43 Merge pull request #27289 from terminalmage/encrypted-cli-pillar 
Feature add: Encrypted CLI pillar data
 2015-09-22 10:34:13 -06:00
Erik Johnson
bacc76c355 Update mocked objects for state module tests 
Added the new pillar_enc value
 2015-09-22 08:25:51 -05:00
FELD Boris
6417161fd7 The CORS implementation was a bit naive about headers allowance. 
A preflight request send the list of headers of the final request
in a special header ```Access-Control-Request-Headers```.
The server must returns the list of allowed header in the special header
```Access-Control-Allow-Headers```.

This PR just returns the whole list of headers but may allow filtering of some
of them quite easily. I'm not sure to see how filtering how headers may
impact security, if anyone has some leads.
 2015-09-18 23:24:43 +02:00
FELD Boris
a4fd1e75c5 Add the support of login payload in JSON and YAML. 
Login endpoint supported only application/x-www-form-urlencoded which may
be an useless limitation. This PR add support for more content-type,
JSON and YAML and every content-type supported by saltnado in general
as it uses the same deserialisation method than the lowstate deserialisation.
 2015-09-18 19:16:47 +02:00
Colton Myers
9864d9e0fa Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/index.rst
    doc/topics/releases/boron.rst
    salt/cli/daemons.py
    salt/cli/salt.py
    salt/modules/jboss7.py
    salt/states/file.py
 2015-09-18 11:03:37 -06:00
Colton Myers
9ddc88c6ba Merge pull request #27198 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-17 15:33:15 -06:00
Colton Myers
1cbfa06591 Remove heavily-mocked failing test 2015-09-17 14:38:05 -06:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
 2015-09-17 11:10:37 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
FELD Boris
5e9c3c7d96 Improve support of Accept header in saltnado. 
It currently supports 'simple' values like application/json, but Accept header
could also include more than one value with parameters
See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1.
For example:

```application/json, text/javascript, */*; q=0.01```

This PR add support for multiple media_range in Accept header, support parsing
of parameter (like q=0.01) but discard them and finally iterate on
media_range and take the first compatible.

A more complete implementation may fully supports the RFC and support
q parameter and specific order of priority to find the most compatible
Content-Type but I don't think it's worth the pain.

If we want a better implementation, werkzeug has actually an implementation
http://werkzeug.pocoo.org/docs/0.10/datastructures/#werkzeug.datastructures.Accept.best_match.
 2015-09-17 00:48:34 +02:00
twangboy
7992b7e20a Fixed some tests... hopefully... 2015-09-15 16:27:47 -06:00
FELD Boris
ef3b7ddc2d Fix lints 2015-09-15 20:29:18 +02:00
FELD Boris
b13f66ee4b Add support for CORS in saltnado. 
Add support for CORS and tests in RPC salt-api. The code was inspired by
https://github.com/globocom/tornado-cors.

Also add support for CORS in websocket. By adding some tests, I made
a small refactoring to make the websocket handler more easily testable.

Some documentation about CORS could be found here
https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
for reference.
 2015-09-15 18:52:44 +02:00
Justin Findlay
440855b182 Merge pull request #27033 from jfindlay/n0ne 
Merge #27019
 2015-09-15 01:32:17 -06:00
Colton Myers
ab519fb5ff Remove heavily-mocked unit tests 2015-09-14 17:00:02 -06:00
Justin Findlay
3334b9d548 fix comment and unit test for reg state 2015-09-14 16:04:09 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
Mike Place
a87a62c5b6 Merge pull request #26857 from bradthurber/add_jboss_domain_mode_to_jboss7_modules 
add jboss domain mode to jboss7 python modules
 2015-09-14 13:40:26 -06:00
Mike Place
b13b6b912a Merge pull request #26984 from tinyclues/26505_improve_content_type_support 
[NetAPI] SaltNado - Improve support for Content-Type parsing. Ref #26505
 2015-09-14 13:02:28 -06:00
Brad Thurber
5d4798012a more test updates 2015-09-14 13:05:07 -04:00
Pedro Algarvio
fcb7138efa Make sure spm tests are picked up by runtests. 
Lists in py2 don't have the clear method
 2015-09-14 17:54:51 +01:00
Brad Thurber
872aabf7fa update more tests 2015-09-14 11:55:42 -04:00
Brad Thurber
b1ceb221a0 more test updates. It wouldn't surprise me if these changes expose other failing tests. 2015-09-14 10:36:40 -04:00
Brad Thurber
72235f61ce clean up lint and add profile to tests 2015-09-14 09:03:30 -04:00
rallytime
a0de117a0f Merge branch '2015.8' into develop 
Conflicts:
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/config/__init__.py
 2015-09-11 09:33:21 -06:00
Justin Findlay
391a09d5ac update reg state unit tests 2015-09-10 16:16:15 -06:00
Justin Findlay
b36a7107b2 update win_path exec module unit tests 2015-09-10 15:17:46 -06:00