Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] devel from ansible:devel #572

Open
wants to merge 1,435 commits into
base: devel
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
1435 commits
Select commit Hold shift + click to select a range
1f15474
Make the role_chain.py script emit a Graphviz file
jbradberry May 3, 2024
0e87e97
Check for a broken ContentType -> model and log and skip
jbradberry May 6, 2024
2050404
Graph out only the parent/child chains from a given Role
jbradberry May 6, 2024
d675207
Handle the case where a resource points to a Role which isn't in the db
jbradberry May 6, 2024
a0b376a
Set up a scenario where IG.use_role_id points to something no longer …
jbradberry May 6, 2024
c8829b0
First cut at checking the role hierarchy
jbradberry May 7, 2024
87e9dcb
Attempt to more thoroughly check the parents of each Role
jbradberry May 7, 2024
054cbe6
Exclude the team grant false positives
jbradberry May 7, 2024
f613b76
Modify the role parent check logic to stay in the roles as much as po…
jbradberry May 7, 2024
fe77fda
Exclude more files in the .gitignore
jbradberry May 8, 2024
d67af79
Attempt to correct any crosslinked parents
jbradberry May 8, 2024
6a317cc
Remove the role_chain.py module
jbradberry May 8, 2024
4a8f6e4
Move the "test" files into their own directory
jbradberry May 8, 2024
ee3e3e1
First cut at detecting which foreign keys enter and exit the topology…
jbradberry May 8, 2024
9e22865
Filter out the relations within the known topology tables
jbradberry May 8, 2024
b837d54
Split the foreign key sql script into an 'into' and 'from' portion
jbradberry May 8, 2024
ad9d590
Adjusted foreignkeys.sql for correctness
jbradberry May 8, 2024
31db6a1
Fix another instance where a bad resource->Role fk could throw a trac…
jbradberry May 13, 2024
4cb061e
Add a readme file with instructions
jbradberry May 15, 2024
8b4efbc
Do not throw away the container of cross-linked parents
jbradberry May 21, 2024
d16b69a
Add output of the update and deletion counts to fix.py
jbradberry May 23, 2024
d45e258
Wait until the end of the fix script to clean up orphaned roles
jbradberry May 29, 2024
dbcd32a
Mark and rebuild the implicit_parents field for all affected roles
jbradberry May 29, 2024
2c3a7fa
Add a new test scenario
jbradberry May 29, 2024
345c1c1
Guard against the role field not being populated
jbradberry Jun 4, 2024
aadcc21
This should deal correctly with the ancestor list mismatches
jbradberry Jun 7, 2024
c312d9b
Rename setting to allow local resource management (#15269)
fosterseth Jun 11, 2024
030704a
Change all uses of ImplicitRoleField to do on_delete=SET_NULL
jbradberry Jun 11, 2024
bfd811f
Upgrade aiohttp for cve 2024-23829 (#15257)
thedoubl3j Jun 12, 2024
a711354
Add 'Terraform State' inventory source support for collection (#15258)
vvarga007 Jun 12, 2024
d94f766
Fix notification name search (#15231)
aeter Jun 13, 2024
31a086b
Add OpenShift Virtualization Inventory source option (#15047)
chadmf Jun 14, 2024
f6c0eff
Use public methods to reference registered models (#15277)
AlanCoding Jun 17, 2024
d5bad1a
Pass the Makefile python exe to ansible-playbook (#15282)
AlanCoding Jun 18, 2024
2c8eef4
Trust proxy headers for host provision callback
chrismeyersfsu Jun 7, 2024
4bbfc8a
Tests for trust proxy and existing explicit proxy
chrismeyersfsu Jun 11, 2024
b93aa20
Revert "Trust proxy headers for host provision callback"
chrismeyersfsu Jun 17, 2024
8645fe5
Add support for x-trusted-proxy
chrismeyersfsu Jun 17, 2024
bef9ef1
Rename delete
chrismeyersfsu Jun 18, 2024
bc2d339
Clarify the search for a proxy
chrismeyersfsu Jun 18, 2024
13dcea0
Check for admin_role in role_check.py (#15283)
fosterseth Jun 20, 2024
4738c83
Fix object-level permission bugs with DAB RBAC system (#15284)
AlanCoding Jun 20, 2024
853af29
Various RBAC fixes related to managed RoleDefinitions (#15287)
AlanCoding Jun 21, 2024
407194d
Added troubleshooting and tips tricks content (#15212)
tvo318 Jun 24, 2024
7c08b29
Temporary workaround for CI failure (#15305)
TheRealHaoLiu Jun 26, 2024
dbc2215
Make attached user models adhere to new API assignments (#15298)
AlanCoding Jun 27, 2024
6f2307f
Add TASK_MANAGER_LOCK_TIMEOUT (#15300)
TheRealHaoLiu Jun 27, 2024
4e0d199
LISTENER_DATABASES clobbers DATABASES OPTIONS (#15306)
jamesmarshall24 Jun 27, 2024
db72c9d
Fix permissions that come from an external auditor role (#15291)
AlanCoding Jun 27, 2024
a70b0c1
Do not use cache in github image build action (#15308)
AlanCoding Jun 28, 2024
b59aff5
Update ExecutionEnvironment model so object-level roles work with DAB…
AlanCoding Jun 28, 2024
98bbc83
Fix server error from DAB ValidationError with strings (#15312)
AlanCoding Jul 1, 2024
37f44d7
Add better error message for wfjt create 403 (#15309)
TheRealHaoLiu Jul 1, 2024
2c4ad6e
Add better 403 error message for Job template create (#15307)
TheRealHaoLiu Jul 1, 2024
6763bad
Added new OpenShift Virtualization inventory source to docs. (#15299)
tvo318 Jul 1, 2024
c4688d6
Add in missing read permissions for organization audit role (#15318)
AlanCoding Jul 2, 2024
94e5795
Prevent assigning credential to user of other org (#15296)
fosterseth Jul 2, 2024
d91af13
Fix server error assigning teams EE object roles (#15320)
AlanCoding Jul 3, 2024
00ba1ea
Suppress docker pull output in checks (#15323)
AlanCoding Jul 3, 2024
ee25181
Add complete test that we have analogs to old versions of roles, fix …
AlanCoding Jul 3, 2024
ea23231
Do not reference self.messages when it does not exist (#15331)
AlanCoding Jul 3, 2024
f595985
Callback for role assignment (#15339)
fosterseth Jul 9, 2024
4e055f4
Added note to API guide for filtering exact matches (#15332)
tvo318 Jul 9, 2024
7fc3d5c
Update ActivityStream UI query to order by id (#15346)
TheRealHaoLiu Jul 9, 2024
b727d2c
Log conflicts and created items by the periodic resource sync (#15337)
AlanCoding Jul 9, 2024
282ba36
Fix EE admin not being able to PATCH/PUT object while providing `orga…
AlanCoding Jul 9, 2024
6c7d29a
Fix command to set db session timeout for locks (#15352)
TheRealHaoLiu Jul 10, 2024
209e7e2
Check member of org when granting cred (#15353)
fosterseth Jul 11, 2024
fde8af9
Fix task ending in error due to bad iterator (#15355)
AlanCoding Jul 12, 2024
fa74238
Fix minor docker build warning (#15362)
TheRealHaoLiu Jul 15, 2024
5a2091f
Build new/old UI with different nodejs version (#15368)
TheRealHaoLiu Jul 16, 2024
587f0ec
Updated the api file to reflect 2024 date (#15369)
tvo318 Jul 16, 2024
acd834d
Check and update django-ansible-base
chrismeyersfsu Jul 12, 2024
df95439
Update .github/workflows/dab-release.yml
chrismeyersfsu Jul 17, 2024
a4fdcc1
Update .github/workflows/dab-release.yml
chrismeyersfsu Jul 17, 2024
cbd9dce
Run at 6 am every day
chrismeyersfsu Jul 17, 2024
22a491c
Put DAB version in the PR title
chrismeyersfsu Jul 17, 2024
7697b6a
Pin 3rd party action at SHA
TheRealHaoLiu Jul 17, 2024
f1448fc
update terminology (#15357)
oraNod Jul 18, 2024
853730a
Allow deleting org of a running workflow job (#15374)
fosterseth Jul 18, 2024
48b4c62
Update DAB update automation PR template (#15376)
TheRealHaoLiu Jul 18, 2024
c71e252
Disable dab-release GHA on fork unless explicitly triggered (#15382)
TheRealHaoLiu Jul 18, 2024
9e5babc
Fix ui-next build for release staging GHA (#15383)
TheRealHaoLiu Jul 18, 2024
9979fc6
Update docs replacements to AWX (#15349)
samccann Jul 18, 2024
bb53328
Create receptor group if missing (#15276)
rchaud Jul 18, 2024
e75bc8b
Fix test_url_base_defaults_to_request to reference local host instead…
djyasin Jul 18, 2024
ddf4f28
Remove links from docker-compose template (#15386)
TheRealHaoLiu Jul 19, 2024
5f42db6
Remove references to translated versions of the docs (#15354)
samccann Jul 19, 2024
864a30e
Remove remnants of controller terms from quickstart docs (#15350)
samccann Jul 19, 2024
381ade1
Fix create_preload_data to allow running without an admin user create…
AlanCoding Jul 19, 2024
a87a044
Update test to conform with new DAB change (#15385)
thedoubl3j Jul 19, 2024
fa670e2
Upgrade to v4 checkout, hide output (#15322)
AlanCoding Jul 19, 2024
59f6151
Loosen up team EE restrictions (#15384)
AlanCoding Jul 22, 2024
7691365
Fix depends_on for awx devel when editable dependencies is enabled (#…
TheRealHaoLiu Jul 22, 2024
139d8f0
Add RECEPTOR_KEEP_WORK_ON_ERROR setting
TheRealHaoLiu Jul 22, 2024
7e77235
Add UI for RECEPTOR_KEEP_WORK_ON_ERROR
TheRealHaoLiu Jul 22, 2024
018f235
Replaced all references of downstream docs to upstream docs (#15388)
tvo318 Jul 24, 2024
32df114
Improve asyncio debugging (#15398)
TheRealHaoLiu Jul 24, 2024
34fa897
Bump django-ansible-base to 2024.7.17 (#15373)
github-actions[bot] Jul 26, 2024
a417660
Make ui_next the default UI (#15405)
fosterseth Jul 29, 2024
54b4acb
Added docs for OTel - awx integration (#15408)
tvo318 Jul 29, 2024
6d0c47f
Re-do PR #14685 for alt-text inventories. (#15394)
tvo318 Jul 31, 2024
37b7a69
Unpin channels-redis (#15329)
jessicamack Aug 7, 2024
73b1536
Only refresh session if updating own password (#15426)
fosterseth Aug 7, 2024
cb2ad41
Fix a test in preparation for syncing description
relrod Aug 7, 2024
1ef77ab
Remove 'AWX' from setting endpoint (#15432)
jessicamack Aug 9, 2024
af02ab4
Bump DAB version manually because bot is on vacation (#15434)
AlanCoding Aug 9, 2024
43a3d4a
Fixes pytest CI error
chrismeyersfsu Aug 9, 2024
ca3e899
Unpin django-split-settings (#15379)
jessicamack Aug 16, 2024
6b462cd
Unpin django-guid and update license (#15381)
jessicamack Aug 16, 2024
39d1922
Update editable deps docs (#15451)
thedoubl3j Aug 20, 2024
c5c617b
Guard around race condition (#15452)
kdelee Aug 20, 2024
500b1c4
SSO login should redirect to new UI index (#15456)
fosterseth Aug 21, 2024
af537b5
Rewrite more access logic in terms of permissions instead of roles (#…
AlanCoding Aug 21, 2024
5a8429d
Update django-ansible-base version to 2024.8.19 (#15454)
AlanCoding Aug 21, 2024
1b5cdf6
Replace ansiconv with ansi2html (#15328)
jessicamack Aug 22, 2024
c6223c0
fix: catch correct exception when parsing filter (#15458)
pb82 Aug 22, 2024
3f8274d
fix: avoid calling undefined method for anonymous users (#15440)
pb82 Aug 22, 2024
78f345c
Remove old UI (#15414)
TheRealHaoLiu Aug 22, 2024
7ed0eee
Make controller specific team and org roles (#15445)
fosterseth Aug 22, 2024
f5760b1
Fix 500 error when ordinary user viewed system JTs (#15465)
AlanCoding Aug 26, 2024
9cf66de
Pin DAB to devel again (#15467)
AlanCoding Aug 27, 2024
d6493fd
Rename System Auditor to Controller System Auditor (#15470)
fosterseth Aug 27, 2024
79c1921
Docs: add Communication guide (#15469)
Andersson007 Aug 28, 2024
50db801
Remove archaic monkey patches (#15338)
AlanCoding Aug 29, 2024
444af2b
catch harakiri graceful signal in middlware and log debug info
kdelee Aug 16, 2024
ac6c563
Fallback to use subscription cred for analytic upload (#15479)
TheRealHaoLiu Aug 30, 2024
c59c64c
Fix SAMLAuth backend to correctly return social auth pipeline results…
newswangerd Aug 30, 2024
8a1d1e9
Remove references to IRC & Google Groups (#15480)
gundalow Aug 30, 2024
376cc35
move inv and cred plugins into awx_plugins
chrismeyersfsu Aug 6, 2024
16d1f34
Delete cred and inv plugins
chrismeyersfsu Aug 28, 2024
4328093
Use awx-plugins instead
chrismeyersfsu Aug 14, 2024
a4346a6
Fix awx-plugins to use #egg=<package_name>
chrismeyersfsu Sep 3, 2024
1d89e1a
Move credential code up a dir
chrismeyersfsu Sep 3, 2024
79684ab
CONTRIBUTING.md: remove IRC remnants (#15492)
Andersson007 Sep 5, 2024
3da9e32
Fix subscription username password setting name (#15493)
TheRealHaoLiu Sep 5, 2024
c4d8fdb
Translate new RBAC to old RBAC (#15490)
fosterseth Sep 6, 2024
5a00806
Fix analytic ship (#15496)
TheRealHaoLiu Sep 9, 2024
82b8f7d
Unpin OpenSSL (#15498)
TheRealHaoLiu Sep 9, 2024
011733a
Hide AUTOMATION_ANALYTICS_LAST_GATHER (#15497)
TheRealHaoLiu Sep 10, 2024
71856d6
Removes collection of unpartitioned_events table (#15501)
Ladas Sep 11, 2024
490db08
Register CredentialType(s) every time Django loads
chrismeyersfsu Sep 5, 2024
1c170c3
fix: avoid race conditions when removing multiple instance (#15495)
pb82 Sep 13, 2024
090511e
🧪 Gather coverage @ CI and upload to Codecov (#15499)
webknjaz Sep 13, 2024
3871940
Add OPTIONAL_UI_URL_PREFIX (#15506)
TheRealHaoLiu Sep 13, 2024
a5de465
🧪 Upload the `devel` branch coverage to Codecov (#15507)
webknjaz Sep 13, 2024
e68370f
Replace `pkg_resources` with `importlib.metadata` (#15441)
webknjaz Sep 13, 2024
a9b0d9f
🧪🚑 Fix fetching the CI image on merges (#15509)
webknjaz Sep 13, 2024
6bfe76d
🧪🚑 Fix running awx image in CI on merge (#15510)
webknjaz Sep 13, 2024
b722f70
🧪 Unmeasure coverage in tests expected to fail (#15512)
webknjaz Sep 13, 2024
1b1975a
🧪💄 Order settings in `coveragerc` (#15515)
webknjaz Sep 13, 2024
d0cc2a1
🧪🚑 Fix checking schema in CI on merge (#15514)
webknjaz Sep 13, 2024
31ae3f2
🧪💅 Migrate to `exclude_also` @ `coveragerc` (#15513)
webknjaz Sep 13, 2024
ea7ca3d
🧪💅 Categorize the Codecov status checks (#15516)
webknjaz Sep 13, 2024
cc6a061
fix: change to url in platform ui (#15518)
pb82 Sep 13, 2024
acd6b2e
Fix instance UI URL generated by API (#15517)
TheRealHaoLiu Sep 13, 2024
3baea0f
Validate org-user membership from gateway (#15508)
fosterseth Sep 13, 2024
abdc669
🧪 Pass specific report files to `codecov-cli` (#15520)
webknjaz Sep 14, 2024
5315a2b
🧪 Use modern `source_pkgs` @ `coveragerc` (#15519)
webknjaz Sep 14, 2024
6fd4836
fix workflow job url (#15522)
pb82 Sep 14, 2024
1140981
update remaining urls for new UI (#15529)
pb82 Sep 15, 2024
c9ae368
Remove ML remnants from docs (#15500)
Andersson007 Sep 16, 2024
ef8cb89
Plugin removals for docs (#15505)
tvo318 Sep 16, 2024
af900c8
fix: maintain order of insertions into m2m relationship tables (#15536)
pb82 Sep 17, 2024
c4500cf
Docs: change Getting started EE guide reference to point to the relev…
Andersson007 Sep 17, 2024
69c1d2f
🧪 Include coverage measurement @ site-packages (#15521)
webknjaz Sep 17, 2024
2ca5fca
🧪💅 Unignore errors in `coveragerc` (#15523)
webknjaz Sep 17, 2024
9fbbe3c
🧪 Use xunit1 in pytest by default (#15524)
webknjaz Sep 17, 2024
0a4370a
🧪 Delegate source filtering to coverage.py (#15528)
webknjaz Sep 17, 2024
66e7210
🧪 Upload coverage from the rest of CI jobs (#15526)
webknjaz Sep 17, 2024
eccc32c
Upload API unit test results to dashboard (#15532)
jessicamack Sep 17, 2024
cf25a09
🧪 Upload ansible-test coverage to Codecov (#15527)
webknjaz Sep 17, 2024
ce2b8e9
🧪🚑 Fix escaping EOLs in `curl` invocation (#15538)
webknjaz Sep 17, 2024
2fdb776
🧪 Run sanity tests w/ ansible-test-gh-action (#15539)
webknjaz Sep 17, 2024
1881c26
Make analytics job ts settings hidden
chrismeyersfsu Sep 16, 2024
14698b1
🧪 Publish awxkit's coverage to Codecov (#15525)
webknjaz Sep 18, 2024
7db7abc
Upload the test results for awx-collection to dashboard (#15543)
jessicamack Sep 20, 2024
5b7a050
Enable service redirect auth and reverse-sync from DAB (#15489)
AlanCoding Sep 23, 2024
486a126
Removed docs associated with OIDC auth (#15557)
tvo318 Sep 30, 2024
48e3afb
Filter out ANSIBLE_BASE_ from job env var (#15558)
TheRealHaoLiu Sep 30, 2024
a1ad320
Removed docs associated with SAML auth. (#15563)
tvo318 Sep 30, 2024
97ececa
Fix 500 error due to None data in DAB response (#15562)
AlanCoding Oct 2, 2024
ece21b1
Use awx-plugins-shared code from `awx_plugins.interfaces` (#15566)
webknjaz Oct 2, 2024
579c2b7
Update AWX collection to use basic authentication (#15554)
ldjebran Oct 8, 2024
825a02c
Adding podAntiAffinity (#15578)
jdowni000 Oct 8, 2024
dbe6fcc
Fix CI for newer debian image (#15583)
relrod Oct 14, 2024
1acf8cf
Add splitted up inventory source plugins (#15584)
TheRealHaoLiu Oct 15, 2024
6dea7bf
Prettier DRF pages when using trusted proxy (#15579)
relrod Oct 15, 2024
f22b192
Remove LDAP authentication (#15546)
ldjebran Oct 2, 2024
e4c1156
Remove TACACS+ authentication (#15547)
ldjebran Oct 2, 2024
2c2694c
Remove RADIUS authentication (#15548)
ldjebran Oct 2, 2024
bcd006f
Remove social oauth (Azure, Github, Google) (#15549)
ldjebran Oct 2, 2024
0f09199
Remove Keycloak (#15567)
jessicamack Oct 2, 2024
65817d4
Removed more mentions about SAML. (#15565)
tvo318 Oct 2, 2024
bf09b95
Remove OIDC (#15569)
jessicamack Oct 2, 2024
1ca034b
Remove SAML authentication (#15568)
jessicamack Oct 2, 2024
4c76974
Remove sso app (#15550)
ldjebran Oct 2, 2024
31e4770
3rd party auth removal cleanup
TheRealHaoLiu Oct 2, 2024
42420eb
remove oauth use
jessicamack Sep 30, 2024
764dcbf
Add gateway support to awxkit (#15576)
gravesm Oct 16, 2024
c85fa70
bump django 4.2.16 to be in line with DAB (#15596)
fosterseth Oct 22, 2024
e21dd0a
Make cloud providers dynamic (#15537)
djyasin Oct 23, 2024
68055bb
Add back git requirements as comments & re-run script (#15317)
AlanCoding Oct 28, 2024
6195e8e
fix: increase max verbosity level for constructed inventory (#15604)
pb82 Nov 5, 2024
f4cbb9f
Fix bug where unrelated jobs were linked as dependencies (#15610)
AlanCoding Nov 6, 2024
aa162c6
Removed oAuth methods from collection docs. (#15606)
tvo318 Nov 7, 2024
dfee5a1
Updated Authentication section to reflect AWX only method. (#15602)
tvo318 Nov 7, 2024
51b1fa4
Install awx collection from branch for operator ci
chrismeyersfsu Nov 5, 2024
d388f91
Metrics dispatcher callback receiver swaparoo
chrismeyersfsu Nov 5, 2024
69baa73
feat: install awx collection from source (#15617)
pb82 Nov 11, 2024
6f184e3
Fix for 'relation "social_auth_usersocialauth" does not exist' error …
djyasin Nov 11, 2024
c9f8804
Make lookup plugins return lists to fix failures (#15625)
AlanCoding Nov 12, 2024
989a438
Set coverage limits so we do not have current failures (#15629)
AlanCoding Nov 12, 2024
5448757
fix: invalid response type on post request (#15609)
pb82 Nov 14, 2024
3dbcfb1
Add test that resource list does not server error (#15635)
AlanCoding Nov 15, 2024
d26396c
Fix error with CLI monitor of ad hoc output (#15642)
AlanCoding Nov 18, 2024
108cf84
Add option to skip credential type discovery
chrismeyersfsu Nov 15, 2024
670b7e7
Fix server error from system job detail view (#15640)
AlanCoding Nov 19, 2024
6599f3f
Removal of OAuth2 stuff from CLI
AlanCoding Nov 4, 2024
3ba6e2e
feat: remove collection support for oauth (#15623)
PabloHiro Nov 19, 2024
51896f0
Make rrule fast forwarding stable (#15601)
fosterseth Nov 21, 2024
ce7911e
Revive the logstash container for testing (#15654)
AlanCoding Nov 21, 2024
d2cd4e0
Do not check error state if null (#15655)
AlanCoding Nov 22, 2024
790875c
Removed UI-focused user docs from AWX. (#15641)
tvo318 Nov 22, 2024
4bbcb34
Add descriptions for plugin names (#15643)
djyasin Nov 25, 2024
d8e87da
🧪 Make pytest notify us about future warnings
webknjaz Nov 7, 2024
789a430
Address unclosed fd warnings
AlanCoding Nov 11, 2024
268ca7c
Remove oauth provider (#15666)
PabloHiro Nov 26, 2024
699c0c7
add custom 404 page (#15668)
oraNod Nov 26, 2024
e411f35
Decouple inject_credentials from dynamic inputs
chrismeyersfsu Dec 2, 2024
adc2162
Ignore warnings so people can run tests on python 3.12 (#15663)
AlanCoding Dec 2, 2024
c64b5eb
Fix missing dependencies due to extras `-` vs `_` (#15677)
AlanCoding Dec 2, 2024
cdb294c
Add the Sphinx notfound page extension (#15669)
oraNod Dec 3, 2024
3ceca1b
use subproject url prefix (#15681)
oraNod Dec 3, 2024
f62dfda
feat: enable django flags support (#15660)
pb82 Dec 3, 2024
cb04ad8
Fix receptor work unit release after completion (#15679)
TheRealHaoLiu Dec 3, 2024
055d853
fix: reset state before evaluating named urls (#15683)
pb82 Dec 4, 2024
698a8ae
Update defaults.py receptor typo (#15682)
tuxonfire Dec 4, 2024
1a35775
Create a new pytest folder for live system testing with normal servic…
AlanCoding Dec 6, 2024
91d92a6
Make dev script work in combined environment (#15684)
AlanCoding Dec 9, 2024
325b6d3
Fix missing exception catch in `create_partition` (#15691)
AlanCoding Dec 10, 2024
4b85e7e
Adopt post_injectors change from awx-plugins
chrismeyersfsu Nov 15, 2024
aeca9db
Rename post_injectors to custom_injectors
chrismeyersfsu Nov 18, 2024
99c18b6
Load all plugins in order to test them
chrismeyersfsu Nov 18, 2024
c82a8f4
Add custom_injectors to test code path
chrismeyersfsu Nov 19, 2024
a129bc8
Flake8 fix
chrismeyersfsu Dec 10, 2024
32122e6
Fix misused project cache identifier (#15690)
AlanCoding Dec 10, 2024
efbe729
bump sqlparse to meet DAB requirement (#15697)
fosterseth Dec 10, 2024
f377b5f
Use runtime log utility moved to DAB (#15675)
AlanCoding Dec 11, 2024
e605883
Do not fast forward rrule if count is set (#15696)
fosterseth Dec 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replace pkg_resources with importlib.metadata (ansible#15441)
webknjaz authored Sep 13, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit e68370f2aa2dc0fb435de39835beb0edc1c55225
7 changes: 3 additions & 4 deletions awx/__init__.py
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
import os
import sys
import warnings
from importlib.metadata import PackageNotFoundError, version as _get_version


def get_version():
@@ -34,10 +35,8 @@ def version_file():


try:
import pkg_resources

__version__ = pkg_resources.get_distribution('awx').version
except pkg_resources.DistributionNotFound:
__version__ = _get_version('awx')
except PackageNotFoundError:
__version__ = get_version()

__all__ = ['__version__']
4 changes: 2 additions & 2 deletions awx/main/db/profiled_pg/base.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import os
import pkg_resources
import sqlite3
import sys
import traceback
import uuid
from importlib.metadata import version as _get_version

from django.core.cache import cache
from django.core.cache.backends.locmem import LocMemCache
@@ -70,7 +70,7 @@ def write(self, query):
else:
progname = os.path.basename(sys.argv[0])
filepath = os.path.join(self.dest, '{}.sqlite'.format(progname))
version = pkg_resources.get_distribution('awx').version
version = _get_version('awx')
log = sqlite3.connect(filepath, timeout=3)
log.execute(
'CREATE TABLE IF NOT EXISTS queries ('
4 changes: 2 additions & 2 deletions awx/main/models/credential.py
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
import inspect
import logging
import os
from pkg_resources import iter_entry_points
from importlib.metadata import entry_points
import re
import stat
import tempfile
@@ -56,7 +56,7 @@
__all__ = ['Credential', 'CredentialType', 'CredentialInputSource', 'build_safe_env']

logger = logging.getLogger('awx.main.models.credential')
credential_plugins = dict((ep.name, ep.load()) for ep in iter_entry_points('awx_plugins.credentials'))
credential_plugins = {entry_point.name: entry_point.load() for entry_point in entry_points(group='awx_plugins.credentials')}

HIDDEN_PASSWORD = '**********'

5 changes: 2 additions & 3 deletions awx/main/utils/common.py
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
import contextlib
import tempfile
import functools
from importlib.metadata import version as _get_version

# Django
from django.core.exceptions import ObjectDoesNotExist, FieldDoesNotExist
@@ -230,9 +231,7 @@ def get_awx_version():
from awx import __version__

try:
import pkg_resources

return pkg_resources.require('awx')[0].version
return _get_version('awx')
except Exception:
return __version__

4 changes: 2 additions & 2 deletions awxkit/awxkit/cli/client.py
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

import logging
import os
import pkg_resources
import sys
from importlib.metadata import version as _get_version

from requests.exceptions import RequestException

@@ -16,7 +16,7 @@
from awxkit.awx.utils import uses_sessions # noqa


__version__ = pkg_resources.get_distribution('awxkit').version
__version__ = _get_version('awxkit')


class CLI(object):
1 change: 0 additions & 1 deletion docs/docsite/rst/rest_api/_swagger/swagger.py
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@
import os

import jinja2
import pkg_resources
import yaml

from sphinx.util.osutil import copyfile, ensuredir
5 changes: 2 additions & 3 deletions tools/scripts/firehose.py
Original file line number Diff line number Diff line change
@@ -30,8 +30,7 @@
import itertools
import json
import multiprocessing
import pkg_resources
import random
import site
import subprocess
import sys
from io import StringIO
@@ -132,7 +131,7 @@ def cleanup(sql):

def generate_jobs(jobs, batch_size, time_delta):
print(f'inserting {jobs} job(s)')
sys.path.insert(0, pkg_resources.get_distribution('awx').module_path)
sys.path[:0] = site.getsitepackages()
from awx import prepare_env

prepare_env()