From e4e2d48f53c1ed34926221984647bdd97a77b5eb Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Mon, 23 Mar 2020 14:34:41 -0400 Subject: [PATCH] Register some missing related endpoints in awxkit - the newer varieties of notification templates - organization workflow job templates - credential owner users and owner teams this allows the endpoints to get wrapped in appropriate Page types, not just the Base page type. --- awxkit/awxkit/api/pages/notification_templates.py | 9 +++++++-- awxkit/awxkit/api/pages/teams.py | 1 + awxkit/awxkit/api/pages/users.py | 1 + awxkit/awxkit/api/pages/workflow_job_templates.py | 3 ++- awxkit/awxkit/api/resources.py | 4 ++++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/awxkit/awxkit/api/pages/notification_templates.py b/awxkit/awxkit/api/pages/notification_templates.py index 60d7af7893..e9016e0b94 100644 --- a/awxkit/awxkit/api/pages/notification_templates.py +++ b/awxkit/awxkit/api/pages/notification_templates.py @@ -209,8 +209,10 @@ page.register_page([resources.notification_template, (resources.notification_templates, 'post'), (resources.notification_template_copy, 'post'), resources.notification_template_any, + resources.notification_template_started, resources.notification_template_error, - resources.notification_template_success], NotificationTemplate) + resources.notification_template_success, + resources.notification_template_approval], NotificationTemplate) class NotificationTemplates(page.PageList, NotificationTemplate): @@ -219,9 +221,12 @@ class NotificationTemplates(page.PageList, NotificationTemplate): page.register_page([resources.notification_templates, + resources.related_notification_templates, resources.notification_templates_any, + resources.notification_templates_started, resources.notification_templates_error, - resources.notification_templates_success], + resources.notification_templates_success, + resources.notification_templates_approvals], NotificationTemplates) diff --git a/awxkit/awxkit/api/pages/teams.py b/awxkit/awxkit/api/pages/teams.py index 95ab8e6a85..fc1e9de3f8 100644 --- a/awxkit/awxkit/api/pages/teams.py +++ b/awxkit/awxkit/api/pages/teams.py @@ -45,4 +45,5 @@ class Teams(page.PageList, Team): page.register_page([resources.teams, + resources.credential_owner_teams, resources.related_teams], Teams) diff --git a/awxkit/awxkit/api/pages/users.py b/awxkit/awxkit/api/pages/users.py index 2c25950e4c..4039ef2e9d 100644 --- a/awxkit/awxkit/api/pages/users.py +++ b/awxkit/awxkit/api/pages/users.py @@ -64,6 +64,7 @@ class Users(page.PageList, User): page.register_page([resources.users, resources.organization_admins, resources.related_users, + resources.credential_owner_users, resources.user_admin_organizations], Users) diff --git a/awxkit/awxkit/api/pages/workflow_job_templates.py b/awxkit/awxkit/api/pages/workflow_job_templates.py index 1d67a0a171..8814a13d59 100644 --- a/awxkit/awxkit/api/pages/workflow_job_templates.py +++ b/awxkit/awxkit/api/pages/workflow_job_templates.py @@ -99,7 +99,8 @@ class WorkflowJobTemplates(page.PageList, WorkflowJobTemplate): pass -page.register_page([resources.workflow_job_templates], WorkflowJobTemplates) +page.register_page([resources.workflow_job_templates, + resources.related_workflow_job_templates], WorkflowJobTemplates) class WorkflowJobTemplateLaunch(base.Base): diff --git a/awxkit/awxkit/api/resources.py b/awxkit/awxkit/api/resources.py index 97a9c31c90..31b671df68 100644 --- a/awxkit/awxkit/api/resources.py +++ b/awxkit/awxkit/api/resources.py @@ -122,14 +122,18 @@ class Resources(object): _notification = r'notifications/\d+/' _notification_template = r'notification_templates/\d+/' _notification_template_any = r'\w+/\d+/notification_templates_any/\d+/' + _notification_template_started = r'\w+/\d+/notification_templates_started/\d+/' _notification_template_copy = r'notification_templates/\d+/copy/' _notification_template_error = r'\w+/\d+/notification_templates_error/\d+/' _notification_template_success = r'\w+/\d+/notification_templates_success/\d+/' + _notification_template_approval = r'\w+/\d+/notification_templates_approvals/\d+/' _notification_template_test = r'notification_templates/\d+/test/' _notification_templates = 'notification_templates/' _notification_templates_any = r'\w+/\d+/notification_templates_any/' + _notification_templates_started = r'\w+/\d+/notification_templates_started/' _notification_templates_error = r'\w+/\d+/notification_templates_error/' _notification_templates_success = r'\w+/\d+/notification_templates_success/' + _notification_templates_approvals = r'\w+/\d+/notification_templates_approvals/' _notifications = 'notifications/' _object_activity_stream = r'[^/]+/\d+/activity_stream/' _org_projects = r'organizations/\d+/projects/'