From e75bc8bc1ea8b18bb9766d7ffbe8939628260c73 Mon Sep 17 00:00:00 2001 From: Lila Yasin Date: Thu, 18 Jul 2024 15:28:54 -0400 Subject: [PATCH] =?UTF-8?q?Fix=20test=5Furl=5Fbase=5Fdefaults=5Fto=5Freque?= =?UTF-8?q?st=20to=20reference=20local=20host=20instead=E2=80=A6=20(#15367?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update all references to towerhost to platformhost * Run prettier on failing ui files --- awx/api/metadata.py | 2 +- awx/main/models/notifications.py | 6 +-- .../tests/functional/api/test_settings.py | 1 - awx/settings/defaults.py | 2 +- awx/ui/src/screens/Host/data.hostFacts.json | 2 +- .../Inventory/shared/data.hostFacts.json | 2 +- awx/ui/src/screens/Job/shared/data.job.json | 2 +- .../screens/Setting/AzureAD/AzureAD.test.js | 2 +- .../AzureADDetail/AzureADDetail.test.js | 4 +- .../AzureAD/AzureADEdit/AzureADEdit.test.js | 2 +- .../src/screens/Setting/GitHub/GitHub.test.js | 12 ++--- .../GitHub/GitHubDetail/GitHubDetail.test.js | 46 ++++++------------- .../GitHubEnterpriseEdit.test.js | 2 +- .../GitHubEnterpriseOrgEdit.test.js | 2 +- .../GitHubEnterpriseTeamEdit.test.js | 2 +- .../GitHubOrgEdit/GitHubOrgEdit.test.js | 2 +- .../GitHubTeamEdit/GitHubTeamEdit.test.js | 2 +- .../Setting/GoogleOAuth2/GoogleOAuth2.test.js | 2 +- .../GoogleOAuth2Detail.test.js | 4 +- .../GoogleOAuth2Edit/GoogleOAuth2Edit.test.js | 2 +- .../MiscSystemDetail/MiscSystemDetail.test.js | 4 +- awx/ui/src/screens/Setting/SAML/SAML.test.js | 6 ++- .../SAML/SAMLDetail/SAMLDetail.test.js | 10 ++-- .../Setting/SAML/SAMLEdit/SAMLEdit.test.js | 6 ++- docs/notification_system.md | 2 +- docs/tower_configuration.md | 2 +- tools/scripts/request_tower_configuration.ps1 | 6 +-- 27 files changed, 62 insertions(+), 75 deletions(-) diff --git a/awx/api/metadata.py b/awx/api/metadata.py index 5adb7d8f12..22eab14545 100644 --- a/awx/api/metadata.py +++ b/awx/api/metadata.py @@ -103,7 +103,7 @@ class Metadata(metadata.SimpleMetadata): default = field.get_default() if type(default) is UUID: default = 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx' - if field.field_name == 'TOWER_URL_BASE' and default == 'https://towerhost': + if field.field_name == 'TOWER_URL_BASE' and default == 'https://platformhost': default = '{}://{}'.format(self.request.scheme, self.request.get_host()) field_info['default'] = default except serializers.SkipField: diff --git a/awx/main/models/notifications.py b/awx/main/models/notifications.py index 38fd2f21b0..97a4f1ae63 100644 --- a/awx/main/models/notifications.py +++ b/awx/main/models/notifications.py @@ -396,11 +396,11 @@ class JobNotificationMixin(object): 'verbosity': 0, }, 'job_friendly_name': 'Job', - 'url': 'https://towerhost/#/jobs/playbook/1010', + 'url': 'https://platformhost/#/jobs/playbook/1010', 'approval_status': 'approved', 'approval_node_name': 'Approve Me', - 'workflow_url': 'https://towerhost/#/jobs/workflow/1010', - 'job_metadata': """{'url': 'https://towerhost/$/jobs/playbook/13', + 'workflow_url': 'https://platformhost/#/jobs/workflow/1010', + 'job_metadata': """{'url': 'https://platformhost/$/jobs/playbook/13', 'traceback': '', 'status': 'running', 'started': '2019-08-07T21:46:38.362630+00:00', diff --git a/awx/main/tests/functional/api/test_settings.py b/awx/main/tests/functional/api/test_settings.py index a1ae7398a5..a84a6f7f6a 100644 --- a/awx/main/tests/functional/api/test_settings.py +++ b/awx/main/tests/functional/api/test_settings.py @@ -10,7 +10,6 @@ from awx.api.versioning import reverse from awx.conf.models import Setting from awx.conf.registry import settings_registry - TEST_GIF_LOGO = 'data:image/gif;base64,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' # NOQA TEST_PNG_LOGO = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAjCAYAAAAaLGNkAAAAAXNSR0IB2cksfwAAAdVpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogICAgICAgICA8dGlmZjpDb21wcmVzc2lvbj4xPC90aWZmOkNvbXByZXNzaW9uPgogICAgICAgICA8dGlmZjpQaG90b21ldHJpY0ludGVycHJldGF0aW9uPjI8L3RpZmY6UGhvdG9tZXRyaWNJbnRlcnByZXRhdGlvbj4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+Cjl0tmoAAAHVSURBVFgJ7VZRsoMgDNTOu5E9U+/Ud6Z6JssGNg2oNKD90xkHCNnNkgTbYbieKwNXBn6bgSXQ4+16xi5UDiqDN3Pecr6+1fM5DHh7n1NEIPjjoRLKzOjG3qQ5dRtEy2LCjh/Gz2wDZE2nZYKkrxdn/kY9XQQkGCGqqDY5IgJFkEKgBCzDNGXhTKEye7boFRH6IPJj5EshiNCSjV4R4eSx7zhmR2tcdIuwmWiMeao7e0JHViZEWUI5aP8a9O+rx74D6sGEiJftiX3YeueIiFXg2KrhpqzjVC3dPZFYJZ7NOwwtNwM8R0UkLfH0sT5qck+OlkMq0BucKr0iWG7gpAQksD9esM1z3Lnf6SHjLh67nnKEGxC/iomWhByTeXOQJGHHcKxwHhHKnt1HIdYtmexkIb/HOURWTSJqn2gKMDG0bDUc/D0iAseovxUBoylmQCug6IVhSv+4DIeKI94jAr4AjiSEgQ25JYB+YWT9BZ94AM8erwgFkRifaArA6U0G5KT0m//z26REZuK9okgrT6VwE1jTHjbVzyNAyRwTEPOtuiex9FVBNZCkruaA4PZqFp1u8Rpww9/6rcK5y0EkAxRiZJt79PWOVYWGRE9pbJhavMengMflGyumk0akMsQnAAAAAElFTkSuQmCC' # NOQA TEST_JPEG_LOGO = 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAASABIAAD/4QBkRXhpZgAATU0AKgAAAAgAAwEGAAMAAAABAAIAAAESAAMAAAABAAEAAIdpAAQAAAABAAAAMgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIaADAAQAAAABAAAAIwAAAAD/4QkhaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJYTVAgQ29yZSA1LjQuMCI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiLz4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8P3hwYWNrZXQgZW5kPSJ3Ij8+AP/tADhQaG90b3Nob3AgMy4wADhCSU0EBAAAAAAAADhCSU0EJQAAAAAAENQdjNmPALIE6YAJmOz4Qn7/wAARCAAjACEDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9sAQwAGBgYGBgYKBgYKDgoKCg4SDg4ODhIXEhISEhIXHBcXFxcXFxwcHBwcHBwcIiIiIiIiJycnJycsLCwsLCwsLCws/9sAQwEHBwcLCgsTCgoTLh8aHy4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLi4u/90ABAAD/9oADAMBAAIRAxEAPwD6poormvFfivSvB2lHVtWLGMtsRE2hnYKzlVLsi52oxALDdjauWKqQCXQfFXh7xP8Aaf7AvYrz7HL5U3lk/K3YjIGVODtcZVsHBODXQV806bcT+E9L03XbCOS2udMsLQanbB4po72xYMfOQpKYyV2zPEwcNwVK7WAr6WriwWMWIUvdcZRdmnuu33rVFSjYKKKK7ST/0PqmuF8Vv4X8S+HNZ0+e/gIsYJvtEsL+bJZsI3UuyxNvBA3gpxvXchyCRXdV8ta3bW667DoloW1y10tLLTJxZWP2hoLSGYzNHclGZpJC0ESk8IAZcRB8is61T2cHK1/1DrY526h8YXHh691vxCz6dafY5Q0U7yGSeQxSxohNzJLcbUeQ4VnVNxBRCWL19b2eraVqE9xa2F3BcS2jbJ0ikV2ibJG1wpJU5UjBx0PpXzrrniy4k17TrrWrGex022ufMijvd9m11PGH8naXKqsUcgR3MhB5U7MA16x4L8F3vhq2sY9Ru4rg6day2tusEAhCrcOkknmEMRI2Y1AcLGT8xYMzZHjZFGu6cquKjaUnt2XS76vv/SN8RVjOdoKyXY9Cooor3TA//9H6pr4gfxRrMvxJ0/whLJE+maVrcVnZRtBCzwQQ3SIipMU80fKignflgPmJr7fr4A/5rf8A9zJ/7eUAdX8SfGviPwl8TtaPh6eK1eTyN0n2eCSUg28OV8ySNn2/KDtztzzjNfZVhY2umWMGm2KeXb2sSQxJknakYCqMkknAHUnNfBXxt/5Kdq//AG7/APpPFX3/AEAFFFFAH//Z' # NOQA diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 546f68f50d..26e9d0107b 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -828,7 +828,7 @@ MANAGE_ORGANIZATION_AUTH = True DISABLE_LOCAL_AUTH = False # Note: This setting may be overridden by database settings. -TOWER_URL_BASE = "https://towerhost" +TOWER_URL_BASE = "https://platformhost" INSIGHTS_URL_BASE = "https://example.org" INSIGHTS_AGENT_MIME = 'application/example' diff --git a/awx/ui/src/screens/Host/data.hostFacts.json b/awx/ui/src/screens/Host/data.hostFacts.json index 0675ffb4ef..6be982a508 100644 --- a/awx/ui/src/screens/Host/data.hostFacts.json +++ b/awx/ui/src/screens/Host/data.hostFacts.json @@ -89,7 +89,7 @@ "LC_ALL": "en_US.UTF-8", "MFLAGS": "-w", "OLDPWD": "/awx_devel", - "AWX_HOST": "https://towerhost", + "AWX_HOST": "https://platformhost", "HOSTNAME": "awx", "LANGUAGE": "en_US:en", "SDB_HOST": "0.0.0.0", diff --git a/awx/ui/src/screens/Inventory/shared/data.hostFacts.json b/awx/ui/src/screens/Inventory/shared/data.hostFacts.json index 0675ffb4ef..6be982a508 100644 --- a/awx/ui/src/screens/Inventory/shared/data.hostFacts.json +++ b/awx/ui/src/screens/Inventory/shared/data.hostFacts.json @@ -89,7 +89,7 @@ "LC_ALL": "en_US.UTF-8", "MFLAGS": "-w", "OLDPWD": "/awx_devel", - "AWX_HOST": "https://towerhost", + "AWX_HOST": "https://platformhost", "HOSTNAME": "awx", "LANGUAGE": "en_US:en", "SDB_HOST": "0.0.0.0", diff --git a/awx/ui/src/screens/Job/shared/data.job.json b/awx/ui/src/screens/Job/shared/data.job.json index f3c2f5064e..43aff22ffb 100644 --- a/awx/ui/src/screens/Job/shared/data.job.json +++ b/awx/ui/src/screens/Job/shared/data.job.json @@ -164,7 +164,7 @@ "ANSIBLE_RETRY_FILES_ENABLED": "False", "MAX_EVENT_RES": "700000", "ANSIBLE_CALLBACK_PLUGINS": "/awx_devel/awx/plugins/callback", - "AWX_HOST": "https://towerhost", + "AWX_HOST": "https://platformhost", "ANSIBLE_SSH_CONTROL_PATH_DIR": "/tmp/awx_2_a4b1afiw/cp", "ANSIBLE_STDOUT_CALLBACK": "awx_display" }, diff --git a/awx/ui/src/screens/Setting/AzureAD/AzureAD.test.js b/awx/ui/src/screens/Setting/AzureAD/AzureAD.test.js index e63563ef24..a9a5f8e745 100644 --- a/awx/ui/src/screens/Setting/AzureAD/AzureAD.test.js +++ b/awx/ui/src/screens/Setting/AzureAD/AzureAD.test.js @@ -16,7 +16,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SOCIAL_AUTH_AZUREAD_OAUTH2_CALLBACK_URL: - 'https://towerhost/sso/complete/azuread-oauth2/', + 'https://platformhost/sso/complete/azuread-oauth2/', SOCIAL_AUTH_AZUREAD_OAUTH2_KEY: 'mock key', SOCIAL_AUTH_AZUREAD_OAUTH2_SECRET: '$encrypted$', SOCIAL_AUTH_AZUREAD_OAUTH2_ORGANIZATION_MAP: {}, diff --git a/awx/ui/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.test.js b/awx/ui/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.test.js index d549071f8f..f1408dad71 100644 --- a/awx/ui/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.test.js +++ b/awx/ui/src/screens/Setting/AzureAD/AzureADDetail/AzureADDetail.test.js @@ -22,7 +22,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SOCIAL_AUTH_AZUREAD_OAUTH2_CALLBACK_URL: - 'https://towerhost/sso/complete/azuread-oauth2/', + 'https://platformhost/sso/complete/azuread-oauth2/', SOCIAL_AUTH_AZUREAD_OAUTH2_KEY: 'mock key', SOCIAL_AUTH_AZUREAD_OAUTH2_SECRET: '$encrypted$', SOCIAL_AUTH_AZUREAD_OAUTH2_ORGANIZATION_MAP: {}, @@ -62,7 +62,7 @@ describe('', () => { assertDetail( wrapper, 'Azure AD OAuth2 Callback URL', - 'https://towerhost/sso/complete/azuread-oauth2/' + 'https://platformhost/sso/complete/azuread-oauth2/' ); assertDetail(wrapper, 'Azure AD OAuth2 Key', 'mock key'); assertDetail(wrapper, 'Azure AD OAuth2 Secret', 'Encrypted'); diff --git a/awx/ui/src/screens/Setting/AzureAD/AzureADEdit/AzureADEdit.test.js b/awx/ui/src/screens/Setting/AzureAD/AzureADEdit/AzureADEdit.test.js index f96b8d2755..7e1b4fcc59 100644 --- a/awx/ui/src/screens/Setting/AzureAD/AzureADEdit/AzureADEdit.test.js +++ b/awx/ui/src/screens/Setting/AzureAD/AzureADEdit/AzureADEdit.test.js @@ -22,7 +22,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SOCIAL_AUTH_AZUREAD_OAUTH2_CALLBACK_URL: - 'https://towerhost/sso/complete/azuread-oauth2/', + 'https://platformhost/sso/complete/azuread-oauth2/', SOCIAL_AUTH_AZUREAD_OAUTH2_KEY: 'mock key', SOCIAL_AUTH_AZUREAD_OAUTH2_SECRET: '$encrypted$', SOCIAL_AUTH_AZUREAD_OAUTH2_ORGANIZATION_MAP: {}, diff --git a/awx/ui/src/screens/Setting/GitHub/GitHub.test.js b/awx/ui/src/screens/Setting/GitHub/GitHub.test.js index b7d88b4a72..28c21edd6c 100644 --- a/awx/ui/src/screens/Setting/GitHub/GitHub.test.js +++ b/awx/ui/src/screens/Setting/GitHub/GitHub.test.js @@ -19,7 +19,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValueOnce({ data: { SOCIAL_AUTH_GITHUB_CALLBACK_URL: - 'https://towerhost/sso/complete/github/', + 'https://platformhost/sso/complete/github/', SOCIAL_AUTH_GITHUB_KEY: 'mock github key', SOCIAL_AUTH_GITHUB_SECRET: '$encrypted$', SOCIAL_AUTH_GITHUB_ORGANIZATION_MAP: null, @@ -29,7 +29,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValueOnce({ data: { SOCIAL_AUTH_GITHUB_ORG_CALLBACK_URL: - 'https://towerhost/sso/complete/github-org/', + 'https://platformhost/sso/complete/github-org/', SOCIAL_AUTH_GITHUB_ORG_KEY: '', SOCIAL_AUTH_GITHUB_ORG_SECRET: '$encrypted$', SOCIAL_AUTH_GITHUB_ORG_NAME: '', @@ -40,7 +40,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValueOnce({ data: { SOCIAL_AUTH_GITHUB_TEAM_CALLBACK_URL: - 'https://towerhost/sso/complete/github-team/', + 'https://platformhost/sso/complete/github-team/', SOCIAL_AUTH_GITHUB_TEAM_KEY: 'OAuth2 key (Client ID)', SOCIAL_AUTH_GITHUB_TEAM_SECRET: '$encrypted$', SOCIAL_AUTH_GITHUB_TEAM_ID: 'team_id', @@ -51,7 +51,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValueOnce({ data: { SOCIAL_AUTH_GITHUB_ENTERPRISE_CALLBACK_URL: - 'https://towerhost/sso/complete/github-enterprise/', + 'https://platformhost/sso/complete/github-enterprise/', SOCIAL_AUTH_GITHUB_ENTERPRISE_URL: 'https://localhost/url', SOCIAL_AUTH_GITHUB_ENTERPRISE_API_URL: 'https://localhost/apiurl', SOCIAL_AUTH_GITHUB_ENTERPRISE_KEY: 'ent_key', @@ -63,7 +63,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValueOnce({ data: { SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_CALLBACK_URL: - 'https://towerhost/sso/complete/github-enterprise-org/', + 'https://platformhost/sso/complete/github-enterprise-org/', SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_URL: 'https://localhost/url', SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_API_URL: 'https://localhost/apiurl', SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_KEY: 'ent_org_key', @@ -76,7 +76,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValueOnce({ data: { SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_CALLBACK_URL: - 'https://towerhost/sso/complete/github-enterprise-team/', + 'https://platformhost/sso/complete/github-enterprise-team/', SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_URL: 'https://localhost/url', SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_API_URL: 'https://localhost/apiurl', SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_KEY: 'ent_team_key', diff --git a/awx/ui/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.test.js b/awx/ui/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.test.js index 256f144459..7fd91a870f 100644 --- a/awx/ui/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.test.js +++ b/awx/ui/src/screens/Setting/GitHub/GitHubDetail/GitHubDetail.test.js @@ -22,7 +22,8 @@ jest.mock('../../../../api'); const mockDefault = { data: { - SOCIAL_AUTH_GITHUB_CALLBACK_URL: 'https://towerhost/sso/complete/github/', + SOCIAL_AUTH_GITHUB_CALLBACK_URL: + 'https://platformhost/sso/complete/github/', SOCIAL_AUTH_GITHUB_KEY: 'mock github key', SOCIAL_AUTH_GITHUB_SECRET: '$encrypted$', SOCIAL_AUTH_GITHUB_ORGANIZATION_MAP: null, @@ -32,7 +33,7 @@ const mockDefault = { const mockOrg = { data: { SOCIAL_AUTH_GITHUB_ORG_CALLBACK_URL: - 'https://towerhost/sso/complete/github-org/', + 'https://platformhost/sso/complete/github-org/', SOCIAL_AUTH_GITHUB_ORG_KEY: '', SOCIAL_AUTH_GITHUB_ORG_SECRET: '$encrypted$', SOCIAL_AUTH_GITHUB_ORG_NAME: '', @@ -43,7 +44,7 @@ const mockOrg = { const mockTeam = { data: { SOCIAL_AUTH_GITHUB_TEAM_CALLBACK_URL: - 'https://towerhost/sso/complete/github-team/', + 'https://platformhost/sso/complete/github-team/', SOCIAL_AUTH_GITHUB_TEAM_KEY: 'OAuth2 key (Client ID)', SOCIAL_AUTH_GITHUB_TEAM_SECRET: '$encrypted$', SOCIAL_AUTH_GITHUB_TEAM_ID: 'team_id', @@ -54,7 +55,7 @@ const mockTeam = { const mockEnterprise = { data: { SOCIAL_AUTH_GITHUB_ENTERPRISE_CALLBACK_URL: - 'https://towerhost/sso/complete/github-enterprise/', + 'https://platformhost/sso/complete/github-enterprise/', SOCIAL_AUTH_GITHUB_ENTERPRISE_URL: 'https://localhost/enterpriseurl', SOCIAL_AUTH_GITHUB_ENTERPRISE_API_URL: 'https://localhost/enterpriseapi', SOCIAL_AUTH_GITHUB_ENTERPRISE_KEY: 'foobar', @@ -66,7 +67,7 @@ const mockEnterprise = { const mockEnterpriseOrg = { data: { SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_CALLBACK_URL: - 'https://towerhost/sso/complete/github-enterprise-org/', + 'https://platformhost/sso/complete/github-enterprise-org/', SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_URL: 'https://localhost/orgurl', SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_API_URL: 'https://localhost/orgapi', SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_KEY: 'foobar', @@ -79,7 +80,7 @@ const mockEnterpriseOrg = { const mockEnterpriseTeam = { data: { SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_CALLBACK_URL: - 'https://towerhost/sso/complete/github-enterprise-team/', + 'https://platformhost/sso/complete/github-enterprise-team/', SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_URL: 'https://localhost/teamurl', SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_API_URL: 'https://localhost/teamapi', SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_KEY: 'foobar', @@ -143,7 +144,7 @@ describe('', () => { assertDetail( wrapper, 'GitHub OAuth2 Callback URL', - 'https://towerhost/sso/complete/github/' + 'https://platformhost/sso/complete/github/' ); assertDetail(wrapper, 'GitHub OAuth2 Key', 'mock github key'); assertDetail(wrapper, 'GitHub OAuth2 Secret', 'Encrypted'); @@ -218,7 +219,7 @@ describe('', () => { assertDetail( wrapper, 'GitHub Organization OAuth2 Callback URL', - 'https://towerhost/sso/complete/github-org/' + 'https://platformhost/sso/complete/github-org/' ); assertDetail(wrapper, 'GitHub Organization OAuth2 Key', 'Not configured'); assertDetail(wrapper, 'GitHub Organization OAuth2 Secret', 'Encrypted'); @@ -269,7 +270,7 @@ describe('', () => { assertDetail( wrapper, 'GitHub Team OAuth2 Callback URL', - 'https://towerhost/sso/complete/github-team/' + 'https://platformhost/sso/complete/github-team/' ); assertDetail(wrapper, 'GitHub Team OAuth2 Key', 'OAuth2 key (Client ID)'); assertDetail(wrapper, 'GitHub Team OAuth2 Secret', 'Encrypted'); @@ -316,7 +317,7 @@ describe('', () => { assertDetail( wrapper, 'GitHub Enterprise OAuth2 Callback URL', - 'https://towerhost/sso/complete/github-enterprise/' + 'https://platformhost/sso/complete/github-enterprise/' ); assertDetail( wrapper, @@ -343,7 +344,7 @@ describe('', () => { }); }); - describe('Enterprise Org', () => { + describe('Enterprise Organization', () => { let wrapper; beforeAll(async () => { @@ -376,7 +377,7 @@ describe('', () => { assertDetail( wrapper, 'GitHub Enterprise Organization OAuth2 Callback URL', - 'https://towerhost/sso/complete/github-enterprise-org/' + 'https://platformhost/sso/complete/github-enterprise-org/' ); assertDetail( wrapper, @@ -445,7 +446,7 @@ describe('', () => { assertDetail( wrapper, 'GitHub Enterprise Team OAuth2 Callback URL', - 'https://towerhost/sso/complete/github-enterprise-team/' + 'https://platformhost/sso/complete/github-enterprise-team/' ); assertDetail( wrapper, @@ -476,23 +477,4 @@ describe('', () => { ); }); }); - - describe('Redirect', () => { - test('should render redirect when user navigates to erroneous category', async () => { - let wrapper; - useRouteMatch.mockImplementation(() => ({ - url: '/settings/github/foo/details', - path: '/settings/github/:category/details', - params: { category: 'foo' }, - })); - await act(async () => { - wrapper = mountWithContexts( - - - - ); - }); - await waitForElement(wrapper, 'Redirect'); - }); - }); }); diff --git a/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseEdit/GitHubEnterpriseEdit.test.js b/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseEdit/GitHubEnterpriseEdit.test.js index 0f334e8365..036cda00f5 100644 --- a/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseEdit/GitHubEnterpriseEdit.test.js +++ b/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseEdit/GitHubEnterpriseEdit.test.js @@ -22,7 +22,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SOCIAL_AUTH_GITHUB_ENTERPRISE_CALLBACK_URL: - 'https://towerhost/sso/complete/github-enterprise/', + 'https://platformhost/sso/complete/github-enterprise/', SOCIAL_AUTH_GITHUB_ENTERPRISE_URL: '', SOCIAL_AUTH_GITHUB_ENTERPRISE_API_URL: '', SOCIAL_AUTH_GITHUB_ENTERPRISE_KEY: '', diff --git a/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseOrgEdit/GitHubEnterpriseOrgEdit.test.js b/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseOrgEdit/GitHubEnterpriseOrgEdit.test.js index b6e55487c8..734d015356 100644 --- a/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseOrgEdit/GitHubEnterpriseOrgEdit.test.js +++ b/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseOrgEdit/GitHubEnterpriseOrgEdit.test.js @@ -22,7 +22,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_CALLBACK_URL: - 'https://towerhost/sso/complete/github-enterprise-org/', + 'https://platformhost/sso/complete/github-enterprise-org/', SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_URL: '', SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_API_URL: '', SOCIAL_AUTH_GITHUB_ENTERPRISE_ORG_KEY: '', diff --git a/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseTeamEdit/GitHubEnterpriseTeamEdit.test.js b/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseTeamEdit/GitHubEnterpriseTeamEdit.test.js index e54c14c1cd..6cea6c3da7 100644 --- a/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseTeamEdit/GitHubEnterpriseTeamEdit.test.js +++ b/awx/ui/src/screens/Setting/GitHub/GitHubEnterpriseTeamEdit/GitHubEnterpriseTeamEdit.test.js @@ -22,7 +22,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_CALLBACK_URL: - 'https://towerhost/sso/complete/github-enterprise-team/', + 'https://platformhost/sso/complete/github-enterprise-team/', SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_URL: '', SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_API_URL: '', SOCIAL_AUTH_GITHUB_ENTERPRISE_TEAM_KEY: '', diff --git a/awx/ui/src/screens/Setting/GitHub/GitHubOrgEdit/GitHubOrgEdit.test.js b/awx/ui/src/screens/Setting/GitHub/GitHubOrgEdit/GitHubOrgEdit.test.js index f8f99b3d25..27f3d9db2d 100644 --- a/awx/ui/src/screens/Setting/GitHub/GitHubOrgEdit/GitHubOrgEdit.test.js +++ b/awx/ui/src/screens/Setting/GitHub/GitHubOrgEdit/GitHubOrgEdit.test.js @@ -22,7 +22,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SOCIAL_AUTH_GITHUB_ORG_CALLBACK_URL: - 'https://towerhost/sso/complete/github-org/', + 'https://platformhost/sso/complete/github-org/', SOCIAL_AUTH_GITHUB_ORG_KEY: '', SOCIAL_AUTH_GITHUB_ORG_SECRET: '$encrypted$', SOCIAL_AUTH_GITHUB_ORG_NAME: '', diff --git a/awx/ui/src/screens/Setting/GitHub/GitHubTeamEdit/GitHubTeamEdit.test.js b/awx/ui/src/screens/Setting/GitHub/GitHubTeamEdit/GitHubTeamEdit.test.js index e8feec6023..bda770a4a5 100644 --- a/awx/ui/src/screens/Setting/GitHub/GitHubTeamEdit/GitHubTeamEdit.test.js +++ b/awx/ui/src/screens/Setting/GitHub/GitHubTeamEdit/GitHubTeamEdit.test.js @@ -22,7 +22,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SOCIAL_AUTH_GITHUB_TEAM_CALLBACK_URL: - 'https://towerhost/sso/complete/github-team/', + 'https://platformhost/sso/complete/github-team/', SOCIAL_AUTH_GITHUB_TEAM_KEY: 'OAuth2 key (Client ID)', SOCIAL_AUTH_GITHUB_TEAM_SECRET: '$encrypted$', SOCIAL_AUTH_GITHUB_TEAM_ID: 'team_id', diff --git a/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2.test.js b/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2.test.js index c192908930..e0ebfd91df 100644 --- a/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2.test.js +++ b/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2.test.js @@ -16,7 +16,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SOCIAL_AUTH_GOOGLE_OAUTH2_CALLBACK_URL: - 'https://towerhost/sso/complete/google-oauth2/', + 'https://platformhost/sso/complete/google-oauth2/', SOCIAL_AUTH_GOOGLE_OAUTH2_KEY: 'mock key', SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET: '$encrypted$', SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS: [ diff --git a/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.test.js b/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.test.js index 4738c7ff13..ed4d764cbb 100644 --- a/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.test.js +++ b/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Detail/GoogleOAuth2Detail.test.js @@ -22,7 +22,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SOCIAL_AUTH_GOOGLE_OAUTH2_CALLBACK_URL: - 'https://towerhost/sso/complete/google-oauth2/', + 'https://platformhost/sso/complete/google-oauth2/', SOCIAL_AUTH_GOOGLE_OAUTH2_KEY: 'mock key', SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET: '$encrypted$', SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS: [ @@ -68,7 +68,7 @@ describe('', () => { assertDetail( wrapper, 'Google OAuth2 Callback URL', - 'https://towerhost/sso/complete/google-oauth2/' + 'https://platformhost/sso/complete/google-oauth2/' ); assertDetail(wrapper, 'Google OAuth2 Key', 'mock key'); assertDetail(wrapper, 'Google OAuth2 Secret', 'Encrypted'); diff --git a/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Edit/GoogleOAuth2Edit.test.js b/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Edit/GoogleOAuth2Edit.test.js index 91b3848d72..c3d054318a 100644 --- a/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Edit/GoogleOAuth2Edit.test.js +++ b/awx/ui/src/screens/Setting/GoogleOAuth2/GoogleOAuth2Edit/GoogleOAuth2Edit.test.js @@ -22,7 +22,7 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SOCIAL_AUTH_GOOGLE_OAUTH2_CALLBACK_URL: - 'https://towerhost/sso/complete/google-oauth2/', + 'https://platformhost/sso/complete/google-oauth2/', SOCIAL_AUTH_GOOGLE_OAUTH2_KEY: 'mock key', SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET: '$encrypted$', SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS: [ diff --git a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js index c9c5c7f9cc..a86a7b2b37 100644 --- a/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js +++ b/awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.test.js @@ -26,7 +26,7 @@ describe('', () => { ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC: false, ORG_ADMINS_CAN_SEE_ALL_USERS: true, MANAGE_ORGANIZATION_AUTH: true, - TOWER_URL_BASE: 'https://towerhost', + TOWER_URL_BASE: 'https://platformhost', REMOTE_HOST_HEADERS: [], PROXY_IP_ALLOWED_LIST: [], CSRF_TRUSTED_ORIGINS: [], @@ -94,7 +94,7 @@ describe('', () => { 'Automation Analytics upload URL', 'https://example.com' ); - assertDetail(wrapper, 'Base URL of the service', 'https://towerhost'); + assertDetail(wrapper, 'Base URL of the service', 'https://platformhost'); assertDetail(wrapper, 'Gather data for Automation Analytics', 'Off'); assertDetail( wrapper, diff --git a/awx/ui/src/screens/Setting/SAML/SAML.test.js b/awx/ui/src/screens/Setting/SAML/SAML.test.js index f3e9653db1..330da3b390 100644 --- a/awx/ui/src/screens/Setting/SAML/SAML.test.js +++ b/awx/ui/src/screens/Setting/SAML/SAML.test.js @@ -15,8 +15,10 @@ describe('', () => { beforeEach(() => { SettingsAPI.readCategory.mockResolvedValue({ data: { - SOCIAL_AUTH_SAML_CALLBACK_URL: 'https://towerhost/sso/complete/saml/', - SOCIAL_AUTH_SAML_METADATA_URL: 'https://towerhost/sso/metadata/saml/', + SOCIAL_AUTH_SAML_CALLBACK_URL: + 'https://platformhost/sso/complete/saml/', + SOCIAL_AUTH_SAML_METADATA_URL: + 'https://platformhost/sso/metadata/saml/', SOCIAL_AUTH_SAML_SP_ENTITY_ID: '', SOCIAL_AUTH_SAML_SP_PUBLIC_CERT: '', SOCIAL_AUTH_SAML_SP_PRIVATE_KEY: '', diff --git a/awx/ui/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.test.js b/awx/ui/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.test.js index ee478baaad..2dba251f55 100644 --- a/awx/ui/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.test.js +++ b/awx/ui/src/screens/Setting/SAML/SAMLDetail/SAMLDetail.test.js @@ -21,8 +21,10 @@ describe('', () => { beforeEach(() => { SettingsAPI.readCategory.mockResolvedValue({ data: { - SOCIAL_AUTH_SAML_CALLBACK_URL: 'https://towerhost/sso/complete/saml/', - SOCIAL_AUTH_SAML_METADATA_URL: 'https://towerhost/sso/metadata/saml/', + SOCIAL_AUTH_SAML_CALLBACK_URL: + 'https://platformhost/sso/complete/saml/', + SOCIAL_AUTH_SAML_METADATA_URL: + 'https://platformhost/sso/metadata/saml/', SOCIAL_AUTH_SAML_SP_ENTITY_ID: 'mock_id', SOCIAL_AUTH_SAML_SP_PUBLIC_CERT: 'mock_cert', SOCIAL_AUTH_SAML_SP_PRIVATE_KEY: '', @@ -71,12 +73,12 @@ describe('', () => { assertDetail( wrapper, 'SAML Assertion Consumer Service (ACS) URL', - 'https://towerhost/sso/complete/saml/' + 'https://platformhost/sso/complete/saml/' ); assertDetail( wrapper, 'SAML Service Provider Metadata URL', - 'https://towerhost/sso/metadata/saml/' + 'https://platformhost/sso/metadata/saml/' ); assertDetail(wrapper, 'SAML Service Provider Entity ID', 'mock_id'); assertVariableDetail( diff --git a/awx/ui/src/screens/Setting/SAML/SAMLEdit/SAMLEdit.test.js b/awx/ui/src/screens/Setting/SAML/SAMLEdit/SAMLEdit.test.js index 0f79df2f7b..9d5f859fcf 100644 --- a/awx/ui/src/screens/Setting/SAML/SAMLEdit/SAMLEdit.test.js +++ b/awx/ui/src/screens/Setting/SAML/SAMLEdit/SAMLEdit.test.js @@ -22,8 +22,10 @@ describe('', () => { SettingsAPI.readCategory.mockResolvedValue({ data: { SAML_AUTO_CREATE_OBJECTS: true, - SOCIAL_AUTH_SAML_CALLBACK_URL: 'https://towerhost/sso/complete/saml/', - SOCIAL_AUTH_SAML_METADATA_URL: 'https://towerhost/sso/metadata/saml/', + SOCIAL_AUTH_SAML_CALLBACK_URL: + 'https://platformhost/sso/complete/saml/', + SOCIAL_AUTH_SAML_METADATA_URL: + 'https://platformhost/sso/metadata/saml/', SOCIAL_AUTH_SAML_SP_ENTITY_ID: 'mock_id', SOCIAL_AUTH_SAML_SP_PUBLIC_CERT: 'mock_cert', SOCIAL_AUTH_SAML_SP_PRIVATE_KEY: '$encrypted$', diff --git a/docs/notification_system.md b/docs/notification_system.md index 96502edfa9..44ac3f9527 100644 --- a/docs/notification_system.md +++ b/docs/notification_system.md @@ -264,7 +264,7 @@ This will create an `httpbin` service reachable from the AWX container at `http: The Grafana notification type allows you to create Grafana annotations. Details about this feature of Grafana are available at http://docs.grafana.org/reference/annotations/. In order to allow AWX to add annotations, an API Key needs to be created in Grafana. Note that the created annotations are region events with start and endtime of the associated AWX Job. The annotation description is also provided by the subject of the associated AWX Job, for example: ``` -Job #1 'Ping Macbook' succeeded: https://towerhost/#/jobs/playbook/1 +Job #1 'Ping Macbook' succeeded: https://platformhost/#/jobs/playbook/1 ``` The configurable options of the Grafana notification type are: diff --git a/docs/tower_configuration.md b/docs/tower_configuration.md index f2c2b94834..ec917fd924 100644 --- a/docs/tower_configuration.md +++ b/docs/tower_configuration.md @@ -18,7 +18,7 @@ X-API-Query-Time: 0.004s X-API-Time: 0.026s { - "SOCIAL_AUTH_GITHUB_TEAM_CALLBACK_URL": "https://towerhost/sso/complete/github-team/", + "SOCIAL_AUTH_GITHUB_TEAM_CALLBACK_URL": "https://platformhost/sso/complete/github-team/", "SOCIAL_AUTH_GITHUB_TEAM_KEY": "", "SOCIAL_AUTH_GITHUB_TEAM_SECRET": "", "SOCIAL_AUTH_GITHUB_TEAM_ID": "", diff --git a/tools/scripts/request_tower_configuration.ps1 b/tools/scripts/request_tower_configuration.ps1 index 4472769a32..63de9566c8 100755 --- a/tools/scripts/request_tower_configuration.ps1 +++ b/tools/scripts/request_tower_configuration.ps1 @@ -30,13 +30,13 @@ Request server configuration from Ansible Tower Usage: Execution using positional parameters: - $($MyInvocation.MyCommand.Name) https://example.towerhost.net 44d7507f2ead49af5fca80aa18fd24bc 38 + $($MyInvocation.MyCommand.Name) https://example.platformhost.net 44d7507f2ead49af5fca80aa18fd24bc 38 Ignore self-signed certificates using named parameters: - $($MyInvocation.MyCommand.Name) -k -s https://example.towerhost.local -c 44d7507f2ead49af5fca80aa18fd24bc -t 38 + $($MyInvocation.MyCommand.Name) -k -s https://example.platformhost.local -c 44d7507f2ead49af5fca80aa18fd24bc -t 38 Execution using optional extra_vars: - $($MyInvocation.MyCommand.Name) https://example.towerhost.net 44d7507f2ead49af5fca80aa18fd24bc 38 '{ key: value, dict: { key: value }}' + $($MyInvocation.MyCommand.Name) https://example.platformhost.net 44d7507f2ead49af5fca80aa18fd24bc 38 '{ key: value, dict: { key: value }}' Options: -help, -h Show this message