zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-14 07:48:39 -05:00
Code Issues Packages Projects Releases Wiki Activity
31,995 Commits 35 Branches 71 Tags
task_manager_refactor_bail_out
Commit Graph

31995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Jones 6c597ad165 Adding initial credential and invsrc for Tower 
* New credential type for Tower
* Inventory source definitions and migrations for Tower
* Initial Tower inventory source script
 2017-10-26 13:51:05 -04:00
AlanCoding 48ec69c4f5 retry cleanup of build artifacts for bwrap race condition 2017-10-26 13:33:21 -04:00
AlanCoding 4e16b19ae6 Refactor access.py get_queryset into filtering method 
Use BaseAccess class to enforce the superuser and system
  auditor conditions, as well as the optimizations.
Declare optimizations on access class as tuple.
Limit role of access class method narrowly to RBAC filtering.
 2017-10-26 11:40:08 -04:00
Aaron Tan 1ea3d55167 Merge pull request #550 from jangsutsr/fix-7737-1 
Follow up fix #7737
 2017-10-26 11:29:05 -04:00
AlanCoding b4a446dba0 raise error for invalid type lookup 2017-10-26 11:25:40 -04:00
Aaron Tan 7181bd1c9b Follow up fix #7737 
The original fix introduced migration failure, this PR managed to fix
that.

Signed-off-by: Aaron Tan <jangsutsr@gmail.com>
 2017-10-26 11:15:07 -04:00
Ryan Petrello 9e8ac3b09b Merge pull request #547 from ryanpetrello/fix-cleanup-memory-usage 
[3.2.2] Backport (from awx) various memory optimizations for job cleanup
 2017-10-26 10:39:58 -04:00
Aaron Tan e24e1fc1f0 Merge pull request #542 from jangsutsr/fix-7737 
[3.2.2]support `AZURE_CLOUD_ENVIRONMENT`
 2017-10-26 10:20:14 -04:00
Aaron Tan f28b48a473 support AZURE_CLOUD_ENVIRONMENT 
Relates #7737 of ansible-tower.

Signed-off-by: Aaron Tan <jangsutsr@gmail.com>
 2017-10-26 10:11:21 -04:00
Michael Abashian 4f58537949 Merge pull request #546 from mabashian/6209-license-readonly-auth-forms 
Make codemirror ready-only when auth form field is disabled
 2017-10-26 09:58:24 -04:00
mabashian 0512f65c8f Only pass host filter param to smart inv shortcut form 2017-10-26 09:55:36 -04:00
Alan Rominger 641b18fe13 Merge pull request #509 from AlanCoding/lib_test_fixes 
update tests to new Ansible core code
 2017-10-26 09:28:52 -04:00
Bill Nottingham c680327ec3 Merge pull request #506 from wenottingham/its-log 
Remove accidentally committed log files
 2017-10-26 09:17:30 -04:00
AlanCoding e5d2eb9f3d update tests to new Ansible core code 2017-10-26 08:34:00 -04:00
Bill Nottingham da25f4104c Update .gitignore for npm log files. 2017-10-25 21:37:29 -04:00
Bill Nottingham 871dc81da3 Avoid task duplication by using default(omit). 2017-10-25 21:30:46 -04:00
mabashian 947bdeed3e Fixed related host list linking 2017-10-25 16:59:44 -04:00
Bill Nottingham 1285e8ffef Add blocks around the different SCMs, for clarity purposes. 2017-10-25 16:58:41 -04:00
Bill Nottingham a8947c3b96 Remove accidentally committed log files 2017-10-25 16:38:56 -04:00
Greg Considine 565d116955 Merge pull request #505 from gconsidine/ui/fix/multiple-dependency-include 
Update dependencies that share Angular as a dependency
 2017-10-25 16:07:29 -04:00
Jake McDermott 1fe9f43690 Merge pull request #502 from jakemcdermott/update_test_config 
test config cleanup and tooling updates
 2017-10-25 15:39:55 -04:00
gconsidine 4a522fd10f Update dependencies that share Angular as a dependency 2017-10-25 14:48:18 -04:00
Jared Tabor 5e349590fd making JOB TEMPLATES tab the last tab on the projects form 2017-10-25 11:21:36 -07:00
Jared Tabor 625c0ad578 Adding Project Based Navigation of Job Templates 
This adds a Job Templates tab onto the Project form that gives
the user the ability to see all the job templates using a project.
Clicking the add button on this list will take the user to the job
template form with the project field auto-filled with the project.
 2017-10-25 11:21:36 -07:00
Mike McMahon d3a7bec674 Backport (from awx) various memory optimizations for job cleanup 
see: https://github.com/ansible/ansible-tower/issues/7751

0388568 Reduces the job to only looking at objects older than the cutoff date
0234311 missing colon and missing variable usage
399e0e5 switching to iterator and adding the missed Job cleanup
0cd34c1 jobs take count of gte cutoff, process only lt cutoff
 2017-10-25 12:17:46 -04:00
Ryan Petrello 652facba9f Merge pull request #545 from ryanpetrello/fix-7746 
work around an ansible bug that can cause project syncs to fail
 2017-10-25 11:37:15 -04:00
mabashian b1ef7506ea Make codemirror ready-only when auth form field is disabled 2017-10-25 11:30:26 -04:00
Ryan Petrello c95d7d465a work around an ansible bug that can cause project syncs to fail 
https://github.com/ansible/ansible-tower/issues/7746
https://github.com/ansible/ansible/issues/30064
 2017-10-25 11:09:39 -04:00
Jake McDermott 3800a16f3e refactor e2e settings and config modules 
This should make the settings and configuration logic less implicit and
a little easier to follow. Some familiarity with the configuration behavior
of nightwatch is still necessary in places - specifically, one should know
that all test_settings defined for non-default environments are treated as
overrides to the values defined for the default environment.
 2017-10-25 10:58:39 -04:00
Jake McDermott d70a0c8c24 cleanup e2e test development tooling and add readme examples 2017-10-25 10:22:18 -04:00
Aaron Tan e999b35c42 Merge pull request #493 from jangsutsr/fix-474 
Add protection against credential getattr
 2017-10-25 09:45:25 -04:00
Michael Abashian 70919638ba Merge pull request #541 from mabashian/7608-adhoc-launch-modal 
Made adhoc launch modal height dynamic
 2017-10-24 14:07:32 -04:00
Michael Abashian 6ea48cd73e Merge pull request #540 from mabashian/6370-delete-inv-src 
Delete inv source hosts before inv source
 2017-10-24 14:07:08 -04:00
Michael Abashian 63ca8e4134 Merge pull request #538 from mabashian/7707-host-filter-remove-tags-v2 
Fixed removing host filter search term with encoded character
 2017-10-24 14:06:37 -04:00
Aaron Tan 725cc469cf Merge pull request #544 from jangsutsr/fix-7747 
[3.2.2]Include vault credential check in job relaunch
 2017-10-24 12:14:01 -04:00
Aaron Tan 553e81f888 Add protection against credential getattr 
Relates #474.

Add protection in `__getattr__` method to prevent possible infinite
recursion loop.

Signed-off-by: Aaron Tan <jangsutsr@gmail.com>
 2017-10-24 12:08:41 -04:00
Aaron Tan 665a4d83e3 Include vault credential check in job relaunch 
Relates #7747 of ansible-tower.

Signed-off-by: Aaron Tan <jangsutsr@gmail.com>
 2017-10-24 11:00:13 -04:00
AlanCoding 018514d657 urlencode unquote host_filter on save 2017-10-24 08:05:08 -04:00
Alan Rominger 73ece87e68 Merge pull request #487 from AlanCoding/E722 
flake8: comply with new E722 rule
 2017-10-23 14:58:27 -04:00
AlanCoding 90f63774f4 flake8: comply with new E722 rule 2017-10-23 14:36:48 -04:00
Marliana Lara 17aecc17d2 Merge pull request #472 from marshmalien/angular_upgrade_1_6_6 
Upgrade to AngularJS v1.6.6
 2017-10-23 14:13:11 -04:00
Marliana Lara 9157f53d43 Update angular-scheduler and angular-tz-extensions versions 2017-10-23 12:29:28 -04:00
Marliana Lara 9bb696aa6e Fix for input directive using strict comparison to determined "checked" row 2017-10-23 12:29:27 -04:00
Marliana Lara 32da686724 Handle errors with ProcessErrors 2017-10-23 12:29:26 -04:00
Marliana Lara cee81e9df6 Fix any unhandled rejections 2017-10-23 12:29:25 -04:00
Ben Thomasson b544922da1 Fix incorrect JS syntax 2017-10-23 12:29:24 -04:00
Ben Thomasson b3c2f35358 Change success to then manually 2017-10-23 12:29:23 -04:00
Ben Thomasson 7d767f8f63 Automatically change .error to .catch. 
Use this script to change .error to .catch using this linux script:

    #!/bin/bash -ex
    #Run in awx/awx/ui/client/src
    FILES=`grep -l -R "\.error(\s*function\s*(data,\s*status)\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*(data,\s*status)\s*{/.catch(({data, status}) => {/g" $FILES

    FILES=`grep -l -R "\.error(this\.error\.bind(this))" . | xargs`
    sed -i "s/\.error(this\.error\.bind(this))/\.catch(this\.catch\.bind(this))/g" $FILES

    FILES=`grep -l -R "\.error(\s*function\s*(error)\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*(error)\s*{/.catch(({error}) => {/g" $FILES

    FILES=`grep -l -R "\.error(\s*function\s*(obj,\s*status)\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*(obj,\s*status)\s*{/.catch(({obj, status}) => {/g" $FILES

    FILES=`grep -l -R "\.error(\s*function\s*(res,\s*status)\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*(res,\s*status)\s*{/.catch(({res, status}) => {/g" $FILES

    FILES=`grep -l -R "\.error(\s*function\s*(msg,\s*code)\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*(msg,\s*code)\s*{/.catch(({msg, code}) => {/g" $FILES

    FILES=`grep -l -R "\.error(\s*function\s*()\s*{" . | xargs`
    sed -i "s/\.error(\s*function\s*()\s*{/.catch(() => {/g" $FILES
 2017-10-23 12:29:22 -04:00
Ben Thomasson 834e6c692c Automatically change instances of .success to .then with this linux script: 
#Run in awx/awx/ui/client/src

    #!/bin/bash -ex
    FILES=`grep -l -R "\.success(\s*function\s*(data)\s*{" . | xargs`
    sed -i "s/\.success(\s*function\s*(data)\s*{/\.then(({data}) => {/g" $FILES

    FILES=`grep -l -R "\.success(\s*function\s*()\s*{" . | xargs`
    sed -i "s/\.success(\s*function\s*()\s*{/\.then(() => {/g" $FILES

    FILES=`grep -l -R "\.success(this\.success\.bind(this))" . | xargs`
    sed -i "s/\.success(this\.success\.bind(this))/\.then(this\.then\.bind(this))/g" $FILES
 2017-10-23 12:29:21 -04:00
Ben Thomasson fabdab78ef Upgrade AngularJS to 1.6.6 2017-10-23 12:29:10 -04:00