Commit Graph

32524 Commits

Author SHA1 Message Date
Wayne Witzel III 87da7d6a93 Merge pull request #5591 from wwitzel3/release_3.1.1
update asgi_amqp version
2017-02-28 16:04:30 -05:00
Michael Abashian d6ba134234 Helpers directory cleanup 2017-02-28 15:54:04 -05:00
John Mitchell cb30b47098 remove old search comments 2017-02-28 15:46:32 -05:00
Jared Tabor 5592d44ec1 Merge pull request #5578 from jaredevantabor/host-event-stdout
host event stdout changes
2017-02-28 12:36:00 -08:00
Graham Mainwaring 4b68a2f208 Merge pull request #5582 from ghjm/devel
Fix MD5 for CentOS 7.3 ISO
2017-02-28 14:21:17 -05:00
Ryan Petrello 7b34b36e5e Merge pull request #5576 from ryanpetrello/fix-4756
prohibit API payloads that represent something other than a JSON object
2017-02-28 14:04:32 -05:00
Wayne Witzel III 9eed328107 update asgi_amqp version 2017-02-28 14:03:52 -05:00
Chris Meyers 9db49d9819 Merge pull request #5586 from chrismeyersfsu/fix-job_start_websocket_race
emit job status over socket after database commit
2017-02-28 13:25:44 -05:00
Ryan Petrello d97ff57cda prohibit API payloads that represent something other than a JSON object
The JSON serializer for our API uses ``json.loads``, which permits *any*
valid JSON (including bare integers, boolean values, etc).  Lots of our
code, however, assumes that inbound JSON content will be a dict.

see: #4756
2017-02-28 13:23:03 -05:00
Chris Meyers c4fb88c0d9 remove uneeded post commit wrapper
* Since we changed the lower level method to always use post commit
message emit
2017-02-28 13:10:00 -05:00
Chris Meyers e09497108e all job status change websockets events should happen after the job hits
the database
2017-02-28 12:56:55 -05:00
Chris Meyers b85361732b Revert "emit job status over socket after database commit"
This reverts commit edefeeacdaf11cf484a4b4893ee9acde5ef85390.
2017-02-28 12:53:59 -05:00
Chris Meyers 7da52c8bef emit job status over socket after database commit
* Wait until the newly created job record hits the database before
telling the websocket clients that the job's status is "pending"
2017-02-28 12:39:55 -05:00
Michael Abashian e5cfa51410 Merge pull request #5584 from mabashian/controllers-audit
Leftover cleanup from 3.1 back to devel
2017-02-28 12:39:37 -05:00
Michael Abashian bfcbd8a823 Leftover cleanup from 3.1 back to devel 2017-02-28 12:03:41 -05:00
Matthew Jones 1fefa4cfdd Merge branch 'stable' into devel
* stable: (275 commits)
  Install correct rpm-sign package in RPM builder
  Updating changelog for 3.1 release
  Switch job_type to check from sync when detecting delete_on_update
  use Unicode apostrophes - not single quotes - for French i18n strings
  pin appdirs==1.4.2
  only cancel deps if we can cancel the inv update
  fixing module_name check and adding support for the debug module
  cancel jobs dependent on inv update
  update tests
  CSS tweaks to workflow results panels
  like inventory updates, check if project update deps already processed
  Revert "Merge pull request #5553 from chrismeyersfsu/fix-waiting_blocked"
  Add awx/ui/client/languages to .gitignore
  Delete awx/ui/client/languages/*.json
  refactor based on review
  Add missing permission check.
  Make current_groups a set to easily avoid duplicates, update asgi-amqp requirement
  avoid duplicated related search fields
  Fix workflow audit items
  fixing module name, json blob, and stdout-for-yum-module on host event
  ...
2017-02-28 11:37:05 -05:00
Ryan Petrello d95b49d3e1 Merge pull request #5579 from ryanpetrello/release_3.1.1
requeue websocket messages that don't (yet) have an established user
2017-02-28 11:20:12 -05:00
Ryan Petrello 45819f6b9a requeue websocket messages that don't (yet) have an established user
There's a race between our `ws_connect` and `ws_receive` methods;
it's possible to fall into a scenario where we're handling a legitimate
message *before* django-channels is able to persist the `user_id` into
the channel session.  This results in a scenario where a user can open
a browser tab and never receive new websocket messages.  In this
scenario, we should just toss the message back into the queue and try
again later (up to a reasonable limit of retries).
2017-02-28 11:12:59 -05:00
Chris Meyers 4271dc23d4 Merge pull request #5580 from chrismeyersfsu/fix-rabbit_mq_password_required
rabbit_mq_password required
2017-02-28 10:39:40 -05:00
jaredevantabor 9cbf9a5c47 host event stdout changes 2017-02-27 18:52:45 -08:00
Matthew Jones cdb757503e Bump version for 3.1.1 release 2017-02-27 21:17:51 -05:00
Matthew Jones fc66bb1e42 Merge branch 'release_3.1.0' into stable
* release_3.1.0: (2069 commits)
  Updating changelog for 3.1 release
  Switch job_type to check from sync when detecting delete_on_update
  use Unicode apostrophes - not single quotes - for French i18n strings
  pin appdirs==1.4.2
  only cancel deps if we can cancel the inv update
  fixing module_name check and adding support for the debug module
  cancel jobs dependent on inv update
  update tests
  CSS tweaks to workflow results panels
  like inventory updates, check if project update deps already processed
  Revert "Merge pull request #5553 from chrismeyersfsu/fix-waiting_blocked"
  Add awx/ui/client/languages to .gitignore
  Delete awx/ui/client/languages/*.json
  refactor based on review
  Add missing permission check.
  Make current_groups a set to easily avoid duplicates, update asgi-amqp requirement
  avoid duplicated related search fields
  Fix workflow audit items
  fixing module name, json blob, and stdout-for-yum-module on host event
  just like we fail running tasks fail waiting tasks
  ...
2017-02-27 16:27:16 -05:00
Matthew Jones 98daaece73 Switch job_type to check from sync when detecting delete_on_update 2017-02-27 16:22:05 -05:00
Michael Abashian a5e4074575 Merge pull request #5530 from mabashian/modularize-v1
Modularized what was left in the controllers directory
2017-02-27 12:55:01 -05:00
Ryan Petrello 242e1b543c Merge pull request #5552 from ryanpetrello/fix-5536
use Unicode apostrophes - not single quotes - for French i18n strings
2017-02-27 12:31:33 -05:00
Ryan Petrello e8ecc4226b use Unicode apostrophes - not single quotes - for French i18n strings
see: #5536
2017-02-27 12:23:07 -05:00
Ryan Petrello 1878fbf973 Merge pull request #5573 from ryanpetrello/fix-appdirs-dep
pin appdirs==1.4.2
2017-02-27 12:21:54 -05:00
Chris Meyers e6e636f247 Merge pull request #5571 from chrismeyersfsu/fix-5566
cancel jobs dependent on inv update
2017-02-27 12:08:09 -05:00
Ryan Petrello 30a3439aa9 pin appdirs==1.4.2
setuptools requires appdirs >= 1.4.0
https://github.com/pypa/setuptools/commit/ff371f18f0076bc63da05334f7e551c1cc29e10d#diff-2eeaed663bd0d25b7e608891384b7298
2017-02-27 12:06:35 -05:00
Jared Tabor d72c79fb26 Merge pull request #5572 from jaredevantabor/host-event-stdout
fixing module_name check and adding support for the debug module
2017-02-27 08:44:44 -08:00
Chris Meyers c1bace87ab only cancel deps if we can cancel the inv update 2017-02-27 11:37:29 -05:00
jaredevantabor 683a1252c8 fixing module_name check and adding support for the debug module 2017-02-27 08:33:53 -08:00
Chris Meyers f3e514246e cancel jobs dependent on inv update 2017-02-27 11:28:29 -05:00
Michael Abashian a1840863da Merge pull request #5569 from mabashian/5563-footer
CSS tweaks to workflow results panels
2017-02-27 11:16:49 -05:00
Chris Meyers fcbce13873 Merge pull request #5568 from chrismeyersfsu/fix-5562
revert waiting task stuck fix
2017-02-27 11:03:23 -05:00
Chris Meyers 9f8df08e1d update tests 2017-02-27 10:56:34 -05:00
Michael Abashian 5c5ab0936e CSS tweaks to workflow results panels 2017-02-27 10:53:41 -05:00
Chris Meyers a1c76d3adc like inventory updates, check if project update deps already processed 2017-02-27 10:34:44 -05:00
Wayne Witzel III c919f1ef30 Merge pull request #5487 from wwitzel3/issue-5341
explicit ordering in workflow_nodes views
2017-02-27 10:06:58 -05:00
Aaron Tan fe3605ccdd Merge pull request #5534 from jangsutsr/3551_restore_original_behavior_of_group_children_unattach
Restore original behavior of group children unattach
2017-02-27 10:05:15 -05:00
Michael Abashian 691dbdcbd8 Merge pull request #5559 from mabashian/workflow-audit-items
Fix workflow audit items
2017-02-27 09:40:41 -05:00
Chris Meyers dd513621f0 Revert "Merge pull request #5553 from chrismeyersfsu/fix-waiting_blocked"
This reverts commit 9ba2122f4f85eecaeb6fa53ac92ea2811b05e83f, reversing
changes made to c3a5f2c96fd85dd1405a8f5c875ffc988dee16a4.
2017-02-27 09:38:45 -05:00
Shane McDonald 739f4e6a50 Add awx/ui/client/languages to .gitignore 2017-02-27 08:56:59 -05:00
Shane McDonald 87f60221ac Delete awx/ui/client/languages/*.json
This should have been in .gitignore
2017-02-27 08:56:25 -05:00
Wayne Witzel III a04411817f refactor based on review 2017-02-24 17:12:40 -05:00
Wayne Witzel III ebd4064b82 Merge pull request #5561 from wwitzel3/release_3.1.0
Make current_groups a set, update asgi-amqp req
2017-02-24 17:08:02 -05:00
Aaron Tan f11a220e64 Add missing permission check. 2017-02-24 17:06:57 -05:00
Wayne Witzel III 4d02ee9445 Make current_groups a set to easily avoid duplicates, update asgi-amqp requirement 2017-02-24 16:59:39 -05:00
Aaron Tan 7415880f20 Merge pull request #5515 from jangsutsr/3254_update_host_detail_put_option
Update host detail put option rework
2017-02-24 16:58:09 -05:00
Alan Rominger 8b383e788b Merge pull request #5560 from AlanCoding/dup_related
Avoid duplicated related search fields
2017-02-24 16:55:25 -05:00