From 92fd6a55dbe35158f7891049c918cb67a3b4b9d9 Mon Sep 17 00:00:00 2001 From: Jens L Date: Tue, 9 May 2023 23:41:42 +0200 Subject: [PATCH] blueprints: adjust wording on managed field (#5558) --- .../0003_alter_blueprintinstance_name.py | 11 + authentik/blueprints/models.py | 6 +- ...vider_backchannel_applications_and_more.py | 33 +++ authentik/core/tests/test_token_api.py | 2 + .../0004_alter_certificatekeypair_name.py | 11 + .../migrations/0020_alter_outpost_type.py | 11 + blueprints/schema.json | 12 +- schema.yml | 200 +++++++++--------- 8 files changed, 177 insertions(+), 109 deletions(-) diff --git a/authentik/blueprints/migrations/0003_alter_blueprintinstance_name.py b/authentik/blueprints/migrations/0003_alter_blueprintinstance_name.py index 9cd613d7b..1757bccda 100644 --- a/authentik/blueprints/migrations/0003_alter_blueprintinstance_name.py +++ b/authentik/blueprints/migrations/0003_alter_blueprintinstance_name.py @@ -17,4 +17,15 @@ class Migration(migrations.Migration): name="name", field=models.TextField(unique=True), ), + migrations.AlterField( + model_name="blueprintinstance", + name="managed", + field=models.TextField( + default=None, + help_text="Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update.", + null=True, + unique=True, + verbose_name="Managed by authentik", + ), + ), ] diff --git a/authentik/blueprints/models.py b/authentik/blueprints/models.py index c6ca5a0a2..2f833a314 100644 --- a/authentik/blueprints/models.py +++ b/authentik/blueprints/models.py @@ -22,15 +22,15 @@ class BlueprintRetrievalFailed(SentryIgnoredException): class ManagedModel(models.Model): - """Model which can be managed by authentik exclusively""" + """Model that can be managed by authentik exclusively""" managed = models.TextField( default=None, null=True, verbose_name=_("Managed by authentik"), help_text=_( - "Objects which are managed by authentik. These objects are created and updated " - "automatically. This is flag only indicates that an object can be overwritten by " + "Objects that are managed by authentik. These objects are created and updated " + "automatically. This flag only indicates that an object can be overwritten by " "migrations. You can still modify the objects via the API, but expect changes " "to be overwritten in a later update." ), diff --git a/authentik/core/migrations/0029_provider_backchannel_applications_and_more.py b/authentik/core/migrations/0029_provider_backchannel_applications_and_more.py index 1eb158813..07cb4f2df 100644 --- a/authentik/core/migrations/0029_provider_backchannel_applications_and_more.py +++ b/authentik/core/migrations/0029_provider_backchannel_applications_and_more.py @@ -46,4 +46,37 @@ class Migration(migrations.Migration): field=models.BooleanField(default=False), ), migrations.RunPython(backport_is_backchannel), + migrations.AlterField( + model_name="propertymapping", + name="managed", + field=models.TextField( + default=None, + help_text="Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update.", + null=True, + unique=True, + verbose_name="Managed by authentik", + ), + ), + migrations.AlterField( + model_name="source", + name="managed", + field=models.TextField( + default=None, + help_text="Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update.", + null=True, + unique=True, + verbose_name="Managed by authentik", + ), + ), + migrations.AlterField( + model_name="token", + name="managed", + field=models.TextField( + default=None, + help_text="Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update.", + null=True, + unique=True, + verbose_name="Managed by authentik", + ), + ), ] diff --git a/authentik/core/tests/test_token_api.py b/authentik/core/tests/test_token_api.py index 9f792d6d0..3584e01a7 100644 --- a/authentik/core/tests/test_token_api.py +++ b/authentik/core/tests/test_token_api.py @@ -77,6 +77,7 @@ class TestTokenAPI(APITestCase): def test_list(self): """Test Token List (Test normal authentication)""" + Token.objects.all().delete() token_should: Token = Token.objects.create( identifier="test", expiring=False, user=self.user ) @@ -88,6 +89,7 @@ class TestTokenAPI(APITestCase): def test_list_admin(self): """Test Token List (Test with admin auth)""" + Token.objects.all().delete() self.client.force_login(self.admin) token_should: Token = Token.objects.create( identifier="test", expiring=False, user=self.user diff --git a/authentik/crypto/migrations/0004_alter_certificatekeypair_name.py b/authentik/crypto/migrations/0004_alter_certificatekeypair_name.py index e0eb7f9f1..44fd26120 100644 --- a/authentik/crypto/migrations/0004_alter_certificatekeypair_name.py +++ b/authentik/crypto/migrations/0004_alter_certificatekeypair_name.py @@ -17,4 +17,15 @@ class Migration(migrations.Migration): name="name", field=models.TextField(unique=True), ), + migrations.AlterField( + model_name="certificatekeypair", + name="managed", + field=models.TextField( + default=None, + help_text="Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update.", + null=True, + unique=True, + verbose_name="Managed by authentik", + ), + ), ] diff --git a/authentik/outposts/migrations/0020_alter_outpost_type.py b/authentik/outposts/migrations/0020_alter_outpost_type.py index 63f627b0e..5036137c0 100644 --- a/authentik/outposts/migrations/0020_alter_outpost_type.py +++ b/authentik/outposts/migrations/0020_alter_outpost_type.py @@ -17,4 +17,15 @@ class Migration(migrations.Migration): default="proxy", ), ), + migrations.AlterField( + model_name="outpost", + name="managed", + field=models.TextField( + default=None, + help_text="Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update.", + null=True, + unique=True, + verbose_name="Managed by authentik", + ), + ), ] diff --git a/blueprints/schema.json b/blueprints/schema.json index 6691b5b69..7806d32ad 100644 --- a/blueprints/schema.json +++ b/blueprints/schema.json @@ -3068,7 +3068,7 @@ ], "minLength": 1, "title": "Managed by authentik", - "description": "Objects which are managed by authentik. These objects are created and updated automatically. This is flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." + "description": "Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." } }, "required": [] @@ -3544,7 +3544,7 @@ ], "minLength": 1, "title": "Managed by authentik", - "description": "Objects which are managed by authentik. These objects are created and updated automatically. This is flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." + "description": "Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." }, "name": { "type": "string", @@ -4525,7 +4525,7 @@ ], "minLength": 1, "title": "Managed by authentik", - "description": "Objects which are managed by authentik. These objects are created and updated automatically. This is flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." + "description": "Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." }, "name": { "type": "string", @@ -4609,7 +4609,7 @@ ], "minLength": 1, "title": "Managed by authentik", - "description": "Objects which are managed by authentik. These objects are created and updated automatically. This is flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." + "description": "Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." }, "name": { "type": "string", @@ -4792,7 +4792,7 @@ ], "minLength": 1, "title": "Managed by authentik", - "description": "Objects which are managed by authentik. These objects are created and updated automatically. This is flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." + "description": "Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." }, "name": { "type": "string", @@ -8267,7 +8267,7 @@ ], "minLength": 1, "title": "Managed by authentik", - "description": "Objects which are managed by authentik. These objects are created and updated automatically. This is flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." + "description": "Objects that are managed by authentik. These objects are created and updated automatically. This flag only indicates that an object can be overwritten by migrations. You can still modify the objects via the API, but expect changes to be overwritten in a later update." }, "identifier": { "type": "string", diff --git a/schema.yml b/schema.yml index 020d2732c..28305d3f8 100644 --- a/schema.yml +++ b/schema.yml @@ -27942,10 +27942,10 @@ components: readOnly: true nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. required: - cert_expiry - cert_subject @@ -30628,10 +30628,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string expression: @@ -30672,10 +30672,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string minLength: 1 @@ -30920,10 +30920,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. readOnly: true user_path_template: type: string @@ -31826,10 +31826,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. readOnly: true user_path_template: type: string @@ -32076,10 +32076,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. required: - config - name @@ -32164,10 +32164,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. required: - config - name @@ -36225,10 +36225,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string minLength: 1 @@ -36677,10 +36677,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. PatchedPasswordExpiryPolicyRequest: type: object description: Password Expiry Policy Serializer @@ -37097,10 +37097,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string minLength: 1 @@ -37302,10 +37302,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string minLength: 1 @@ -37362,10 +37362,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string minLength: 1 @@ -37463,10 +37463,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. identifier: type: string minLength: 1 @@ -37726,10 +37726,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. readOnly: true user_path_template: type: string @@ -38322,10 +38322,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string expression: @@ -39156,10 +39156,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string expression: @@ -39203,10 +39203,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string minLength: 1 @@ -39548,10 +39548,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. readOnly: true user_path_template: type: string @@ -39740,10 +39740,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string expression: @@ -39781,10 +39781,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string minLength: 1 @@ -39941,10 +39941,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string expression: @@ -39990,10 +39990,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. name: type: string minLength: 1 @@ -40214,10 +40214,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. readOnly: true user_path_template: type: string @@ -40740,10 +40740,10 @@ components: type: string nullable: true title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. identifier: type: string maxLength: 255 @@ -40812,10 +40812,10 @@ components: nullable: true minLength: 1 title: Managed by authentik - description: Objects which are managed by authentik. These objects are created - and updated automatically. This is flag only indicates that an object - can be overwritten by migrations. You can still modify the objects via - the API, but expect changes to be overwritten in a later update. + description: Objects that are managed by authentik. These objects are created + and updated automatically. This flag only indicates that an object can + be overwritten by migrations. You can still modify the objects via the + API, but expect changes to be overwritten in a later update. identifier: type: string minLength: 1