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

Delete the cleanup_tokens system job template #15711

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from

Conversation

AlanCoding
Copy link
Member

@AlanCoding AlanCoding commented Dec 18, 2024

SUMMARY

Missed in the OAuth2 token removal work. Requires a schema & data migration.

Screenshot from 2024-12-18 11-12-16

ISSUE TYPE
  • Bug, Docs Fix or other nominal change
COMPONENT NAME
  • API

@AlanCoding
Copy link
Member Author

I can not figure out this failure

  File "/awx_devel/awx/main/tests/functional/test_credential.py", line 77, in test_default_cred_types
    assert sorted(CredentialType.defaults.keys()) == sorted(
AssertionError: assert ['aim', 'aws'...c_token', ...] == ['aim', 'aws'...c_token', ...]
  
  At index 7 diff: 'cloudforms' != 'conjur'
  Left contains one more item: 'vmware'
  Use -v to get more diff

@AlanCoding
Copy link
Member Author

Locally:

In [2]: sorted(CredentialType.defaults.keys()) == sorted(
   ...:         [
   ...:             'aim',
   ...:             'aws',
   ...:             'aws_secretsmanager_credential',
   ...:             'azure_kv',
   ...:             'azure_rm',
   ...:             'bitbucket_dc_token',
   ...:             'centrify_vault_kv',
   ...:             'conjur',  # issue
   ...:             'controller',
   ...:             'galaxy_api_token',

and this matches the static list.

So my theory is that this PR rebuilds the image, which then causes the awx-plugins to refresh and "cloudforms" appears.

@AlanCoding
Copy link
Member Author

Schema change is intended

@@ -9237,8 +9237,7 @@
           "enum": [
             "cleanup_jobs",
             "cleanup_activitystream",
-            "cleanup_sessions",
-            "cleanup_tokens"
+            "cleanup_sessions"
           ],
           "title": "Job type",
           "type": "string",

Copy link
Member

@thedoubl3j thedoubl3j left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch, lgtm

@AlanCoding
Copy link
Member Author

We are holding on merging until the UI has time to look into their own changes so tests don't break @nixocio @akus062381

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants