update requirements, add migrations

ansible · Oct 2, 2024 · f562dd4 · f562dd4
1 parent 7ca549f
commit f562dd4
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 91 deletions.
diff --git a/awx/conf/migrations/0011_remove_saml_auth_conf.py b/awx/conf/migrations/0011_remove_saml_auth_conf.py
@@ -0,0 +1,40 @@
+# Generated by Django 4.2.10 on 2024-08-27 14:20
+
+from django.db import migrations
+
+SAML_AUTH_CONF_KEYS = [
+    'SAML_AUTO_CREATE_OBJECTS',
+    'SOCIAL_AUTH_SAML_CALLBACK_URL',
+    'SOCIAL_AUTH_SAML_METADATA_URL',
+    'SOCIAL_AUTH_SAML_SP_ENTITY_ID',
+    'SOCIAL_AUTH_SAML_SP_PUBLIC_CERT',
+    'SOCIAL_AUTH_SAML_SP_PRIVATE_KEY',
+    'SOCIAL_AUTH_SAML_ORG_INFO',
+    'SOCIAL_AUTH_SAML_TECHNICAL_CONTACT',
+    'SOCIAL_AUTH_SAML_SUPPORT_CONTACT',
+    'SOCIAL_AUTH_SAML_ENABLED_IDPS',
+    'SOCIAL_AUTH_SAML_SECURITY_CONFIG',
+    'SOCIAL_AUTH_SAML_SP_EXTRA',
+    'SOCIAL_AUTH_SAML_EXTRA_DATA',
+    'SOCIAL_AUTH_SAML_ORGANIZATION_MAP',
+    'SOCIAL_AUTH_SAML_TEAM_MAP',
+    'SOCIAL_AUTH_SAML_ORGANIZATION_ATTR',
+    'SOCIAL_AUTH_SAML_TEAM_ATTR',
+    'SOCIAL_AUTH_SAML_USER_FLAGS_BY_ATTR',
+]
+
+
+def remove_saml_auth_conf(apps, scheme_editor):
+    setting = apps.get_model('conf', 'Setting')
+    setting.objects.filter(key__in=SAML_AUTH_CONF_KEYS).delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('conf', '0010_change_to_JSONField'),
+    ]
+
+    operations = [
+        migrations.RunPython(remove_saml_auth_conf),
+    ]
diff --git a/awx/sso/migrations/0004_alter_userenterpriseauth_provider.py b/awx/sso/migrations/0004_alter_userenterpriseauth_provider.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-10-02 12:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sso', '0003_convert_saml_string_to_list'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userenterpriseauth',
+            name='provider',
+            field=models.CharField(choices=[('radius', 'RADIUS'), ('tacacs+', 'TACACS+')], max_length=32),
+        ),
+    ]
diff --git a/licenses/lxml.txt b/licenses/lxml.txt
diff --git a/licenses/xmlsec.txt b/licenses/xmlsec.txt
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -229,7 +229,6 @@ isodate==0.6.1
     #   azure-keyvault-keys
     #   azure-keyvault-secrets
     #   msrest
-    #   python3-saml
 jaraco-collections==5.0.0
     # via irc
 jaraco-context==4.3.0
@@ -265,10 +264,6 @@ kubernetes==29.0.0
     # via openshift
 lockfile==0.12.2
     # via python-daemon
-lxml==4.9.4
-    # via
-    #   python3-saml
-    #   xmlsec
 markdown==3.5.2
     # via -r /awx_devel/requirements/requirements.in
 markupsafe==2.1.5
@@ -570,8 +565,6 @@ wrapt==1.16.0
     # via
     #   deprecated
     #   opentelemetry-instrumentation
-xmlsec==1.3.13
-    # via python3-saml
 yarl==1.9.4
     # via aiohttp
 zipp==3.17.0