From 3e7a720ffbbe293cc1f9bbad799e0495b58087e5 Mon Sep 17 00:00:00 2001 From: tomdds Date: Tue, 29 Oct 2019 16:28:28 -0400 Subject: [PATCH] Post-rebase fixes --- Pipfile.lock | 55 ++++++++++++++++++++++------ atst/domain/csp/cloud.py | 4 +- atst/models/permissions.py | 4 +- tests/domain/cloud/test_azure_csp.py | 6 +-- 4 files changed, 47 insertions(+), 22 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 45241281..815fc74d 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,17 +1,19 @@ { "_meta": { "hash": { - "sha256": "3e1d71e50dafe3cd2aec48615fba53e12c35761459a6c6cf7e4a3df30502f4ee" + "sha256": "6d2ab855267daac877ae7464de9dba5b62b7d89288992f87d8fc6ff0c0d2520f" }, "pipfile-spec": 6, "requires": { "python_version": "3.7.3" }, - "sources": [{ - "name": "pypi", - "url": "https://pypi.org/simple", - "verify_ssl": true - }] + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] }, "default": { "adal": { @@ -487,6 +489,13 @@ "index": "pypi", "version": "==2.22.0" }, + "requests-oauthlib": { + "hashes": [ + "sha256:bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57", + "sha256:d3ed0c8f2e3bbc6b344fa63d6f933745ab394469da38db16bdddb461c7e25140" + ], + "version": "==1.2.0" + }, "six": { "hashes": [ "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", @@ -623,11 +632,11 @@ }, "black": { "hashes": [ - "sha256:09a9dcb7c46ed496a9850b76e4e825d6049ecd38b611f1224857a79bd985a8cf", - "sha256:68950ffd4d9169716bcb8719a56c07a2f4485354fec061cdd5910aa07369731c" + "sha256:1b30e59be925fafc1ee4565e5e08abef6b03fe455102883820fe5ee2e4734e0b", + "sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539" ], "index": "pypi", - "version": "==19.3b0" + "version": "==19.10b0" }, "blinker": { "hashes": [ @@ -703,11 +712,11 @@ }, "detect-secrets": { "hashes": [ - "sha256:d6b22e93fa5ccdf11391f87d18c45cba64e11463fdb367e2314cdbeba6963ec0", - "sha256:e2189cd21619fc95a3ee7ec7adfb61adf66e2e4e78d518318a6025ca0f62b364" + "sha256:2f1dfe05d1f1bcd46205a46a4117c82a49b2c837771efc625e967c0a710b25a9", + "sha256:8e3cc5bb21fee76e71fee4d57c65b2928b4badb7ae45a5839e70f625057f1a21" ], "index": "pypi", - "version": "==0.12.7" + "version": "==0.13.0" }, "docopt": { "hashes": [ @@ -931,6 +940,12 @@ ], "version": "==0.5.1" }, + "pathspec": { + "hashes": [ + "sha256:e285ccc8b0785beadd4c18e5708b12bb8fcf529a1e61215b3feff1d1e559ea5c" + ], + "version": "==0.6.0" + }, "pathtools": { "hashes": [ "sha256:7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0" @@ -1075,6 +1090,22 @@ "index": "pypi", "version": "==5.1.2" }, + "regex": { + "hashes": [ + "sha256:1e9f9bc44ca195baf0040b1938e6801d2f3409661c15fe57f8164c678cfc663f", + "sha256:587b62d48ca359d2d4f02d486f1f0aa9a20fbaf23a9d4198c4bed72ab2f6c849", + "sha256:835ccdcdc612821edf132c20aef3eaaecfb884c9454fdc480d5887562594ac61", + "sha256:93f6c9da57e704e128d90736430c5c59dd733327882b371b0cae8833106c2a21", + "sha256:a46f27d267665016acb3ec8c6046ec5eae8cf80befe85ba47f43c6f5ec636dcd", + "sha256:c5c8999b3a341b21ac2c6ec704cfcccbc50f1fedd61b6a8ee915ca7fd4b0a557", + "sha256:d4d1829cf97632673aa49f378b0a2c3925acd795148c5ace8ef854217abbee89", + "sha256:d96479257e8e4d1d7800adb26bf9c5ca5bab1648a1eddcac84d107b73dc68327", + "sha256:f20f4912daf443220436759858f96fefbfc6c6ba9e67835fd6e4e9b73582791a", + "sha256:f2b37b5b2c2a9d56d9e88efef200ec09c36c7f323f9d58d0b985a90923df386d", + "sha256:fe765b809a1f7ce642c2edeee351e7ebd84391640031ba4b60af8d91a9045890" + ], + "version": "==2019.8.19" + }, "requests": { "hashes": [ "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", diff --git a/atst/domain/csp/cloud.py b/atst/domain/csp/cloud.py index 35e7b2bf..9e921757 100644 --- a/atst/domain/csp/cloud.py +++ b/atst/domain/csp/cloud.py @@ -431,9 +431,7 @@ class AzureCloudProvider(CloudProviderInterface): credentials = self._get_credential_obj(self._root_creds) sub_client = self.sdk.subscription.SubscriptionClient(credentials) - display_name = ( - f"{environment.application.name}_{environment.name}_{environment.id}" - ) # proposed format + display_name = f"{environment.application.name}_{environment.name}_{environment.id}" # proposed format billing_profile_id = "?" # something chained from environment? sku_id = AZURE_SKU_ID diff --git a/atst/models/permissions.py b/atst/models/permissions.py index f9e73046..f68bfc12 100644 --- a/atst/models/permissions.py +++ b/atst/models/permissions.py @@ -30,8 +30,8 @@ class Permissions(object): CREATE_TASK_ORDER = "create_task_order" # create a new TO VIEW_TASK_ORDER_DETAILS = "view_task_order_details" # individual TO page EDIT_TASK_ORDER_DETAILS = ( - "edit_task_order_details" - ) # edit TO that has not been finalized + "edit_task_order_details" # edit TO that has not been finalized + ) # reporting VIEW_PORTFOLIO_REPORTS = "view_portfolio_reports" diff --git a/tests/domain/cloud/test_azure_csp.py b/tests/domain/cloud/test_azure_csp.py index 67ca30f9..661cd2f2 100644 --- a/tests/domain/cloud/test_azure_csp.py +++ b/tests/domain/cloud/test_azure_csp.py @@ -4,11 +4,7 @@ from unittest.mock import Mock from uuid import uuid4 from atst.domain.csp.cloud import EnvironmentCreationException, AzureCloudProvider -from atst.jobs import ( - do_create_environment, - do_create_atat_admin_user, - do_create_environment_baseline, -) +from atst.jobs import do_create_environment, do_create_atat_admin_user from tests.mock_azure import mock_azure, AUTH_CREDENTIALS from tests.factories import EnvironmentFactory