post-rebase fixes
This commit is contained in:
parent
1a7db62dac
commit
ca4feaa403
@ -27,7 +27,6 @@ from .models import (
|
||||
EnvironmentCSPPayload,
|
||||
EnvironmentCSPResult,
|
||||
KeyVaultCredentials,
|
||||
ManagementGroupCSPResponse,
|
||||
ProductPurchaseCSPPayload,
|
||||
ProductPurchaseCSPResult,
|
||||
ProductPurchaseVerificationCSPPayload,
|
||||
@ -155,8 +154,6 @@ class AzureCloudProvider(CloudProviderInterface):
|
||||
payload.parent_id,
|
||||
)
|
||||
|
||||
if
|
||||
|
||||
return EnvironmentCSPResult(**response)
|
||||
|
||||
def create_atat_admin_user(
|
||||
|
@ -4,9 +4,7 @@ from .cloud_provider_interface import CloudProviderInterface
|
||||
from .exceptions import (
|
||||
AuthenticationException,
|
||||
AuthorizationException,
|
||||
BaselineProvisionException,
|
||||
ConnectionException,
|
||||
EnvironmentCreationException,
|
||||
GeneralCSPException,
|
||||
UnknownServerException,
|
||||
UserProvisioningException,
|
||||
|
@ -61,7 +61,7 @@ def test_create_environment_succeeds(mock_azure: AzureCloudProvider):
|
||||
environment = EnvironmentFactory.create()
|
||||
mock_management_group_create(mock_azure, {"id": "Test Id"})
|
||||
|
||||
mock_azure = mock_get_secret(mock_azure, lambda *a, **k: json.dumps(MOCK_CREDS))
|
||||
mock_azure = mock_get_secret(mock_azure)
|
||||
|
||||
payload = EnvironmentCSPPayload(
|
||||
tenant_id="1234", display_name=environment.name, parent_id=str(uuid4())
|
||||
|
@ -155,7 +155,7 @@ def test_dispatch_create_environment(session, monkeypatch):
|
||||
# Given that I have a portfolio with an active CLIN and two environments,
|
||||
# one of which is deleted
|
||||
portfolio = PortfolioFactory.create(
|
||||
applications=[{"environments": [{}, {}]}],
|
||||
applications=[{"environments": [{}, {}], "cloud_id": uuid4().hex}],
|
||||
task_orders=[
|
||||
{
|
||||
"create_clins": [
|
||||
|
Loading…
x
Reference in New Issue
Block a user