Merge pull request #1367 from dod-ccpo/remove-csp-routes

Remove mock CSP routes

.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"
       }
     ]

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())

atst/routes/applications/__init__.py

@@ -22,9 +22,4 @@ def wrap_environment_role_lookup(user, environment_id=None, **kwargs):
 @applications_bp.route("/environments/<environment_id>/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")

templates/mock_csp.html

@@ -1,65 +0,0 @@
-<label for="toggle">
-  <svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 16 16" width="100" height="100">
-    <path fill="white" id="cloud_icon" d="M11.5 15H5c-2.757 0-5-2.243-5-5 0-2.204 1.446-4.126 3.511-4.769C4.395 3.277 6.335 2 8.5 2c2.773 0 5.058 2.034 5.434 4.727C15.205 7.548 16 8.972 16 10.5c0 2.481-2.019 4.5-4.5 4.5zm-3-11c-1.493 0-2.819.962-3.3 2.394-.115.342-.407.596-.762.664C3.025 7.326 2 8.563 2 10c0 1.654 1.346 3 3 3h6.5c1.379 0 2.5-1.121 2.5-2.5 0-.972-.553-1.835-1.441-2.254-.339-.16-.561-.495-.573-.869C11.918 5.483 10.387 4 8.5 4z"/>
-  </svg>
-</label>
-<input type="checkbox" id="toggle" />
-
-<div class="main">
-  <p align="center" >Once the Cloud Service Provider is selected, this link will take you to the CSP's {{ text }}!</p>
-</div>
-
-<style>
-  html, body {
-    height: 100%;
-    margin: 0px;
-  }
-
-  .main p {
-    font-family: "Source Sans Pro", sans-serif;
-    margin: 1.6rem 0;
-    font-size: 1.8rem;
-    font-weight: 700;
-    color: black;
-    position: fixed;
-    top: 9em;
-    width: 70%;
-    left: 15%;
-  }
-
-  /* Toggle Switch */
-  label {
-    display: block;
-    height: 100px;
-    width: 100px;
-    margin: 20px 0;
-    position: fixed;
-    left: 50%;
-    margin-left: -50px;
-    top: 8em;
-  }
-
-  input#toggle {
-     position: absolute;
-     top: -9999px;
-     left: -9999px;
-  }
-
-  /* Wrapper */
-  .main {
-    width: 100%;
-    height: 100%;
-    background: url(static/img/cloud_background.jpg);
-    background-size: cover;
-  }
-
-  /* Toggle Background Image */
-  input#toggle:checked + .main {
-    background: url(static/img/cloud-background-2.gif);
-    background-size: cover;
-  }
-
-  input#toggle:checked + .main p {
-    color: white;
-  }
-</style>

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):

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