diff --git a/.secrets.baseline b/.secrets.baseline index 258ea89e..e343eb4f 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$|^.*pgsslrootcert.yml$", "lines": null }, - "generated_at": "2020-01-19T20:21:20Z", + "generated_at": "2020-01-29T16:40:16Z", "plugins_used": [ { "base64_limit": 4.5, @@ -145,7 +145,7 @@ "hashed_secret": "e4f14805dfd1e6af030359090c535e149e6b4207", "is_secret": false, "is_verified": false, - "line_number": 649, + "line_number": 647, "type": "Hex High Entropy String" } ] diff --git a/atst/routes/__init__.py b/atst/routes/__init__.py index 52873e4c..5fb7e22f 100644 --- a/atst/routes/__init__.py +++ b/atst/routes/__init__.py @@ -130,13 +130,3 @@ def logout(): @bp.route("/about") def about(): return render_template("about.html") - - -@bp.route("/csp-environment-access") -def csp_environment_access(): - return render_template("mock_csp.html", text="console for this environment") - - -@bp.route("/jedi-csp-calculator") -def jedi_csp_calculator(): - return redirect(app.csp.cloud.get_calculator_url()) diff --git a/atst/routes/applications/__init__.py b/atst/routes/applications/__init__.py index 8e09c1ed..c8668479 100644 --- a/atst/routes/applications/__init__.py +++ b/atst/routes/applications/__init__.py @@ -22,9 +22,4 @@ def wrap_environment_role_lookup(user, environment_id=None, **kwargs): @applications_bp.route("/environments//access") @user_can(None, override=wrap_environment_role_lookup, message="access environment") def access_environment(environment_id): - env_role = EnvironmentRoles.get_by_user_and_environment( - g.current_user.id, environment_id - ) - login_url = app.csp.cloud.get_environment_login_url(env_role.environment) - - return redirect(url_for("atst.csp_environment_access", login_url=login_url)) + return redirect("https://portal.azure.com") diff --git a/static/img/JEDIhierarchyDiagram.png b/static/img/JEDIhierarchyDiagram.png deleted file mode 100644 index 6a6057ee..00000000 Binary files a/static/img/JEDIhierarchyDiagram.png and /dev/null differ diff --git a/static/img/cloud-background-2.gif b/static/img/cloud-background-2.gif deleted file mode 100644 index 9635cef2..00000000 Binary files a/static/img/cloud-background-2.gif and /dev/null differ diff --git a/templates/mock_csp.html b/templates/mock_csp.html deleted file mode 100644 index 5478be2c..00000000 --- a/templates/mock_csp.html +++ /dev/null @@ -1,65 +0,0 @@ - - - -
-

Once the Cloud Service Provider is selected, this link will take you to the CSP's {{ text }}!

-
- - diff --git a/tests/routes/applications/test_init.py b/tests/routes/applications/test_init.py index 6691d5d9..f2f29318 100644 --- a/tests/routes/applications/test_init.py +++ b/tests/routes/applications/test_init.py @@ -15,7 +15,7 @@ def test_environment_access_with_env_role(client, user_session): url_for("applications.access_environment", environment_id=environment.id) ) assert response.status_code == 302 - assert "csp-environment-access" in response.location + assert "portal.azure.com" in response.location def test_environment_access_with_no_role(client, user_session): diff --git a/tests/test_access.py b/tests/test_access.py index f8879024..38ea9daf 100644 --- a/tests/test_access.py +++ b/tests/test_access.py @@ -19,9 +19,7 @@ from atst.app import make_config, make_app _NO_ACCESS_CHECK_REQUIRED = _NO_LOGIN_REQUIRED + [ "applications.accept_invitation", # available to all users; access control is built into invitation logic "atst.catch_all", # available to all users - "atst.csp_environment_access", # internal redirect "atst.home", # available to all users - "atst.jedi_csp_calculator", # internal redirect "dev.messages", # dev tool "dev.test_email", # dev tool "portfolios.accept_invitation", # available to all users; access control is built into invitation logic