From 801c2fd2f35886978a9a777f9a5ab6bd1e55f74b Mon Sep 17 00:00:00 2001 From: neevnuv Date: Wed, 24 Jan 2024 08:12:34 +0000 Subject: [PATCH 01/17] Add CredentialInputSource --- awxkit/awxkit/api/pages/api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py index 2283f10c96..ca0ae06065 100644 --- a/awxkit/awxkit/api/pages/api.py +++ b/awxkit/awxkit/api/pages/api.py @@ -48,6 +48,7 @@ DEPENDENT_EXPORT = [ ('Inventory', 'Host'), ('Inventory', 'Label'), ('WorkflowJobTemplateNode', 'WorkflowApprovalTemplate'), + ('Credential', 'CredentialInputSource'), ] From f9d0dbe6dab72249e8ed354f41bc67ce4194d63e Mon Sep 17 00:00:00 2001 From: Neev Geffen <133771232+neevnuv@users.noreply.github.com> Date: Wed, 24 Jan 2024 11:29:10 +0200 Subject: [PATCH 02/17] Awxkit add credential input sources output for credentials (#1) * testing on credential_input_source output * testing2 * change from usage of credential_input_source to related_input_source * fix change * Add natural key * remove description from natural key --- awxkit/awxkit/api/pages/credential_input_sources.py | 1 + 1 file changed, 1 insertion(+) diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index 3b96fa72b6..b19c1e8c1f 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -4,6 +4,7 @@ from . import page class CredentialInputSource(base.Base): + NATURAL_KEY = ('metadata', 'input_field_name') pass From 14f02f39794b91de809e8fc22412e72ab873256f Mon Sep 17 00:00:00 2001 From: Neev Geffen <133771232+neevnuv@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:48:24 +0200 Subject: [PATCH 03/17] remove metadata from natural key (#2) --- awxkit/awxkit/api/pages/credential_input_sources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index b19c1e8c1f..6a0e83355d 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -4,7 +4,7 @@ from . import page class CredentialInputSource(base.Base): - NATURAL_KEY = ('metadata', 'input_field_name') + NATURAL_KEY = ('input_field_name') pass From be8d7819b8142eb68824bf25d5c89c81eac3315e Mon Sep 17 00:00:00 2001 From: neevnuv Date: Tue, 27 Feb 2024 16:25:29 +0000 Subject: [PATCH 04/17] Remove NATURAL_KEY and change to dependant nonexport --- awxkit/awxkit/api/pages/api.py | 2 +- awxkit/awxkit/api/pages/credential_input_sources.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py index ca0ae06065..43de730887 100644 --- a/awxkit/awxkit/api/pages/api.py +++ b/awxkit/awxkit/api/pages/api.py @@ -48,7 +48,6 @@ DEPENDENT_EXPORT = [ ('Inventory', 'Host'), ('Inventory', 'Label'), ('WorkflowJobTemplateNode', 'WorkflowApprovalTemplate'), - ('Credential', 'CredentialInputSource'), ] @@ -63,6 +62,7 @@ DEPENDENT_NONEXPORT = [ ('Group', 'potential_children'), ('Host', 'all_groups'), ('WorkflowJobTemplateNode', 'create_approval_template'), + ('Credential', 'CredentialInputSource'), ] diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index 6a0e83355d..3b96fa72b6 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -4,7 +4,6 @@ from . import page class CredentialInputSource(base.Base): - NATURAL_KEY = ('input_field_name') pass From 597e9bf1b59fb571ad3e20b0f19242cde6449e78 Mon Sep 17 00:00:00 2001 From: neevnuv Date: Sun, 14 Apr 2024 21:16:34 +0000 Subject: [PATCH 05/17] adding credential_input_soucres --- awxkit/awxkit/api/pages/api.py | 4 ++-- awxkit/awxkit/api/pages/credential_input_sources.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py index 43de730887..51fe737f19 100644 --- a/awxkit/awxkit/api/pages/api.py +++ b/awxkit/awxkit/api/pages/api.py @@ -30,7 +30,7 @@ EXPORTABLE_RESOURCES = [ ] -EXPORTABLE_RELATIONS = ['Roles', 'NotificationTemplates', 'WorkflowJobTemplateNodes', 'Credentials', 'Hosts', 'Groups', 'ExecutionEnvironments', 'Schedules'] +EXPORTABLE_RELATIONS = ['Roles', 'NotificationTemplates', 'WorkflowJobTemplateNodes', 'Credentials', 'Hosts', 'Groups', 'ExecutionEnvironments', 'Schedules', 'CredentialInputSource'] # These are special-case related objects, where we want only in this @@ -48,6 +48,7 @@ DEPENDENT_EXPORT = [ ('Inventory', 'Host'), ('Inventory', 'Label'), ('WorkflowJobTemplateNode', 'WorkflowApprovalTemplate'), + ('Credential', 'CredentialInputSource'), ] @@ -62,7 +63,6 @@ DEPENDENT_NONEXPORT = [ ('Group', 'potential_children'), ('Host', 'all_groups'), ('WorkflowJobTemplateNode', 'create_approval_template'), - ('Credential', 'CredentialInputSource'), ] diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index 3b96fa72b6..63ef9dbb91 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -4,6 +4,7 @@ from . import page class CredentialInputSource(base.Base): + NATURAL_KEY=('target_credential', 'input_field_name') pass From 1828a0090b53eeb95f3cd9e0afcfa0e729957daf Mon Sep 17 00:00:00 2001 From: neevnuv Date: Sun, 14 Apr 2024 21:17:35 +0000 Subject: [PATCH 06/17] add to credential_input EXPORTABLE_RESOURCES --- awxkit/awxkit/api/pages/api.py | 1 + awxkit/awxkit/api/pages/credential_input_sources.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py index 51fe737f19..929982f743 100644 --- a/awxkit/awxkit/api/pages/api.py +++ b/awxkit/awxkit/api/pages/api.py @@ -27,6 +27,7 @@ EXPORTABLE_RESOURCES = [ 'execution_environments', 'applications', 'schedules', + 'credential_input_sources', ] diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index 63ef9dbb91..cec046fc98 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -1,9 +1,11 @@ from awxkit.api.resources import resources +from awxkit.api.pages import Credential from . import base from . import page class CredentialInputSource(base.Base): + dependencies = [Credential] NATURAL_KEY=('target_credential', 'input_field_name') pass From e1d3ff152eabf5ce4733a0cab096c614d629dffd Mon Sep 17 00:00:00 2001 From: Neev Geffen <133771232+neevnuv@users.noreply.github.com> Date: Thu, 6 Jun 2024 12:25:59 +0300 Subject: [PATCH 07/17] Remove unneccessery pass --- awxkit/awxkit/api/pages/credential_input_sources.py | 1 - 1 file changed, 1 deletion(-) diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index cec046fc98..4759b79e56 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -7,7 +7,6 @@ from . import page class CredentialInputSource(base.Base): dependencies = [Credential] NATURAL_KEY=('target_credential', 'input_field_name') - pass page.register_page(resources.credential_input_source, CredentialInputSource) From 6c1c33e47d9c8337d303b5a433964e88d500c7f7 Mon Sep 17 00:00:00 2001 From: Neev Geffen <133771232+neevnuv@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:00:46 +0300 Subject: [PATCH 08/17] add HasCreate --- awxkit/awxkit/api/pages/credential_input_sources.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index 4759b79e56..59bdac0382 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -1,10 +1,11 @@ from awxkit.api.resources import resources from awxkit.api.pages import Credential +from awxkit.api.mixins import HasCreate from . import base from . import page -class CredentialInputSource(base.Base): +class CredentialInputSource(HasCreate, base.Base): dependencies = [Credential] NATURAL_KEY=('target_credential', 'input_field_name') From fe31c8f087a06f32f5191ce7b050e60378704690 Mon Sep 17 00:00:00 2001 From: neevnuv Date: Wed, 24 Jan 2024 08:12:34 +0000 Subject: [PATCH 09/17] Add CredentialInputSource --- awxkit/awxkit/api/pages/api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py index 2283f10c96..ca0ae06065 100644 --- a/awxkit/awxkit/api/pages/api.py +++ b/awxkit/awxkit/api/pages/api.py @@ -48,6 +48,7 @@ DEPENDENT_EXPORT = [ ('Inventory', 'Host'), ('Inventory', 'Label'), ('WorkflowJobTemplateNode', 'WorkflowApprovalTemplate'), + ('Credential', 'CredentialInputSource'), ] From 541ef8ecee7184a67775bbeb032a848629ce5fcf Mon Sep 17 00:00:00 2001 From: Neev Geffen <133771232+neevnuv@users.noreply.github.com> Date: Wed, 24 Jan 2024 11:29:10 +0200 Subject: [PATCH 10/17] Awxkit add credential input sources output for credentials (#1) * testing on credential_input_source output * testing2 * change from usage of credential_input_source to related_input_source * fix change * Add natural key * remove description from natural key --- awxkit/awxkit/api/pages/credential_input_sources.py | 1 + 1 file changed, 1 insertion(+) diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index 3b96fa72b6..b19c1e8c1f 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -4,6 +4,7 @@ from . import page class CredentialInputSource(base.Base): + NATURAL_KEY = ('metadata', 'input_field_name') pass From 172cd68b665005a47311c5e263fb17fb5ef6a9fa Mon Sep 17 00:00:00 2001 From: Neev Geffen <133771232+neevnuv@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:48:24 +0200 Subject: [PATCH 11/17] remove metadata from natural key (#2) --- awxkit/awxkit/api/pages/credential_input_sources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index b19c1e8c1f..6a0e83355d 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -4,7 +4,7 @@ from . import page class CredentialInputSource(base.Base): - NATURAL_KEY = ('metadata', 'input_field_name') + NATURAL_KEY = ('input_field_name') pass From 07054d0d99443ebc1dffd6d06cad770e1d47a634 Mon Sep 17 00:00:00 2001 From: neevnuv Date: Tue, 27 Feb 2024 16:25:29 +0000 Subject: [PATCH 12/17] Remove NATURAL_KEY and change to dependant nonexport --- awxkit/awxkit/api/pages/api.py | 2 +- awxkit/awxkit/api/pages/credential_input_sources.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py index ca0ae06065..43de730887 100644 --- a/awxkit/awxkit/api/pages/api.py +++ b/awxkit/awxkit/api/pages/api.py @@ -48,7 +48,6 @@ DEPENDENT_EXPORT = [ ('Inventory', 'Host'), ('Inventory', 'Label'), ('WorkflowJobTemplateNode', 'WorkflowApprovalTemplate'), - ('Credential', 'CredentialInputSource'), ] @@ -63,6 +62,7 @@ DEPENDENT_NONEXPORT = [ ('Group', 'potential_children'), ('Host', 'all_groups'), ('WorkflowJobTemplateNode', 'create_approval_template'), + ('Credential', 'CredentialInputSource'), ] diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index 6a0e83355d..3b96fa72b6 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -4,7 +4,6 @@ from . import page class CredentialInputSource(base.Base): - NATURAL_KEY = ('input_field_name') pass From 281e1d0e2ea3b639c9d5bb611ce40b6e0abd966e Mon Sep 17 00:00:00 2001 From: neevnuv Date: Sun, 14 Apr 2024 21:16:34 +0000 Subject: [PATCH 13/17] adding credential_input_soucres --- awxkit/awxkit/api/pages/api.py | 4 ++-- awxkit/awxkit/api/pages/credential_input_sources.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py index 43de730887..51fe737f19 100644 --- a/awxkit/awxkit/api/pages/api.py +++ b/awxkit/awxkit/api/pages/api.py @@ -30,7 +30,7 @@ EXPORTABLE_RESOURCES = [ ] -EXPORTABLE_RELATIONS = ['Roles', 'NotificationTemplates', 'WorkflowJobTemplateNodes', 'Credentials', 'Hosts', 'Groups', 'ExecutionEnvironments', 'Schedules'] +EXPORTABLE_RELATIONS = ['Roles', 'NotificationTemplates', 'WorkflowJobTemplateNodes', 'Credentials', 'Hosts', 'Groups', 'ExecutionEnvironments', 'Schedules', 'CredentialInputSource'] # These are special-case related objects, where we want only in this @@ -48,6 +48,7 @@ DEPENDENT_EXPORT = [ ('Inventory', 'Host'), ('Inventory', 'Label'), ('WorkflowJobTemplateNode', 'WorkflowApprovalTemplate'), + ('Credential', 'CredentialInputSource'), ] @@ -62,7 +63,6 @@ DEPENDENT_NONEXPORT = [ ('Group', 'potential_children'), ('Host', 'all_groups'), ('WorkflowJobTemplateNode', 'create_approval_template'), - ('Credential', 'CredentialInputSource'), ] diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index 3b96fa72b6..63ef9dbb91 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -4,6 +4,7 @@ from . import page class CredentialInputSource(base.Base): + NATURAL_KEY=('target_credential', 'input_field_name') pass From 74eaceadc3e3c75d3491b57062257e3eecac2ff8 Mon Sep 17 00:00:00 2001 From: neevnuv Date: Sun, 14 Apr 2024 21:17:35 +0000 Subject: [PATCH 14/17] add to credential_input EXPORTABLE_RESOURCES --- awxkit/awxkit/api/pages/api.py | 1 + awxkit/awxkit/api/pages/credential_input_sources.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py index 51fe737f19..929982f743 100644 --- a/awxkit/awxkit/api/pages/api.py +++ b/awxkit/awxkit/api/pages/api.py @@ -27,6 +27,7 @@ EXPORTABLE_RESOURCES = [ 'execution_environments', 'applications', 'schedules', + 'credential_input_sources', ] diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index 63ef9dbb91..cec046fc98 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -1,9 +1,11 @@ from awxkit.api.resources import resources +from awxkit.api.pages import Credential from . import base from . import page class CredentialInputSource(base.Base): + dependencies = [Credential] NATURAL_KEY=('target_credential', 'input_field_name') pass From 9a6692025ca49928a1e548c6d87861f4e11998c8 Mon Sep 17 00:00:00 2001 From: Neev Geffen <133771232+neevnuv@users.noreply.github.com> Date: Thu, 6 Jun 2024 12:25:59 +0300 Subject: [PATCH 15/17] Remove unneccessery pass --- awxkit/awxkit/api/pages/credential_input_sources.py | 1 - 1 file changed, 1 deletion(-) diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index cec046fc98..4759b79e56 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -7,7 +7,6 @@ from . import page class CredentialInputSource(base.Base): dependencies = [Credential] NATURAL_KEY=('target_credential', 'input_field_name') - pass page.register_page(resources.credential_input_source, CredentialInputSource) From ef861c66d11774b41ea807c6f633998320a35080 Mon Sep 17 00:00:00 2001 From: Neev Geffen <133771232+neevnuv@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:00:46 +0300 Subject: [PATCH 16/17] add HasCreate --- awxkit/awxkit/api/pages/credential_input_sources.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index 4759b79e56..59bdac0382 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -1,10 +1,11 @@ from awxkit.api.resources import resources from awxkit.api.pages import Credential +from awxkit.api.mixins import HasCreate from . import base from . import page -class CredentialInputSource(base.Base): +class CredentialInputSource(HasCreate, base.Base): dependencies = [Credential] NATURAL_KEY=('target_credential', 'input_field_name') From 56b9806883a2034867ed1b884ed2044991e4dd09 Mon Sep 17 00:00:00 2001 From: neevnuv Date: Fri, 19 Jul 2024 19:53:08 +0000 Subject: [PATCH 17/17] fix linting --- awxkit/awxkit/api/pages/api.py | 12 +++++++++++- awxkit/awxkit/api/pages/credential_input_sources.py | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/awxkit/awxkit/api/pages/api.py b/awxkit/awxkit/api/pages/api.py index 929982f743..5dc848ff7c 100644 --- a/awxkit/awxkit/api/pages/api.py +++ b/awxkit/awxkit/api/pages/api.py @@ -31,7 +31,17 @@ EXPORTABLE_RESOURCES = [ ] -EXPORTABLE_RELATIONS = ['Roles', 'NotificationTemplates', 'WorkflowJobTemplateNodes', 'Credentials', 'Hosts', 'Groups', 'ExecutionEnvironments', 'Schedules', 'CredentialInputSource'] +EXPORTABLE_RELATIONS = [ + 'Roles', + 'NotificationTemplates', + 'WorkflowJobTemplateNodes', + 'Credentials', + 'Hosts', + 'Groups', + 'ExecutionEnvironments', + 'Schedules', + 'CredentialInputSource', +] # These are special-case related objects, where we want only in this diff --git a/awxkit/awxkit/api/pages/credential_input_sources.py b/awxkit/awxkit/api/pages/credential_input_sources.py index 59bdac0382..625c27c1a5 100644 --- a/awxkit/awxkit/api/pages/credential_input_sources.py +++ b/awxkit/awxkit/api/pages/credential_input_sources.py @@ -7,7 +7,7 @@ from . import page class CredentialInputSource(HasCreate, base.Base): dependencies = [Credential] - NATURAL_KEY=('target_credential', 'input_field_name') + NATURAL_KEY = ('target_credential', 'input_field_name') page.register_page(resources.credential_input_source, CredentialInputSource)