From 9de90d796d6019c78bc090f1a01dcf1f1d677d88 Mon Sep 17 00:00:00 2001
From: graham-dds <graham.beckley-ctr@friends.dds.mil>
Date: Mon, 21 Oct 2019 10:51:48 -0400
Subject: [PATCH] Rename audit log feature flag config variable

---
 atst/app.py                          | 4 +---
 atst/models/mixins/auditable.py      | 2 +-
 atst/routes/ccpo.py                  | 2 +-
 config/base.ini                      | 2 +-
 templates/applications/settings.html | 2 +-
 templates/portfolios/admin.html      | 2 +-
 tests/conftest.py                    | 4 ++--
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/atst/app.py b/atst/app.py
index 8ad78a3e..4be64f58 100644
--- a/atst/app.py
+++ b/atst/app.py
@@ -150,9 +150,7 @@ def set_default_headers(app):  # pragma: no cover
 def map_config(config):
     return {
         **config["default"],
-        "AUDIT_LOG_FEATURE_TOGGLE": config["default"].getboolean(
-            "AUDIT_LOG_FEATURE_TOGGLE"
-        ),
+        "USE_AUDIT_LOG": config["default"].getboolean("USE_AUDIT_LOG"),
         "ENV": config["default"]["ENVIRONMENT"],
         "BROKER_URL": config["default"]["REDIS_URI"],
         "DEBUG": config["default"].getboolean("DEBUG"),
diff --git a/atst/models/mixins/auditable.py b/atst/models/mixins/auditable.py
index b2a3f527..30567547 100644
--- a/atst/models/mixins/auditable.py
+++ b/atst/models/mixins/auditable.py
@@ -37,7 +37,7 @@ class AuditableMixin(object):
             },
         )
 
-        if app.config.get("AUDIT_LOG_FEATURE_TOGGLE", False):
+        if app.config.get("USE_AUDIT_LOG", False):
             audit_event = AuditEvent(**log_data)
             audit_event.save(connection)
 
diff --git a/atst/routes/ccpo.py b/atst/routes/ccpo.py
index bb627eea..9e8dc155 100644
--- a/atst/routes/ccpo.py
+++ b/atst/routes/ccpo.py
@@ -24,7 +24,7 @@ bp.context_processor(atat_context_processor)
 @bp.route("/activity-history")
 @user_can(Permissions.VIEW_AUDIT_LOG, message="view activity log")
 def activity_history():
-    if app.config.get("AUDIT_LOG_FEATURE_TOGGLE", False):
+    if app.config.get("USE_AUDIT_LOG", False):
         pagination_opts = Paginator.get_pagination_opts(request)
         audit_events = AuditLog.get_all_events(pagination_opts)
         return render_template("audit_log/audit_log.html", audit_events=audit_events)
diff --git a/config/base.ini b/config/base.ini
index d34d3991..7fcdd19f 100644
--- a/config/base.ini
+++ b/config/base.ini
@@ -1,5 +1,5 @@
 [default]
-AUDIT_LOG_FEATURE_TOGGLE = false
+USE_AUDIT_LOG = false
 CAC_URL = http://localhost:8000/login-redirect
 CA_CHAIN = ssl/server-certs/ca-chain.pem
 CLASSIFIED = false
diff --git a/templates/applications/settings.html b/templates/applications/settings.html
index ba9ba537..fe6ac908 100644
--- a/templates/applications/settings.html
+++ b/templates/applications/settings.html
@@ -117,7 +117,7 @@
 
   <hr>
 
-  {% if user_can(permissions.VIEW_APPLICATION_ACTIVITY_LOG) and config.get("AUDIT_LOG_FEATURE_TOGGLE", False) %}
+  {% if user_can(permissions.VIEW_APPLICATION_ACTIVITY_LOG) and config.get("USE_AUDIT_LOG", False) %}
     {% include "fragments/audit_events_log.html" %}
     {{ Pagination(audit_events, url=url_for('applications.settings', application_id=application.id)) }}
   {% endif %}
diff --git a/templates/portfolios/admin.html b/templates/portfolios/admin.html
index e4b89320..5bfb7d7c 100644
--- a/templates/portfolios/admin.html
+++ b/templates/portfolios/admin.html
@@ -64,7 +64,7 @@
       {% include "portfolios/fragments/portfolio_members.html" %}
     {% endif %}
     
-    {% if user_can(permissions.VIEW_PORTFOLIO_ACTIVITY_LOG) and config.get("AUDIT_LOG_FEATURE_TOGGLE", False) %}
+    {% if user_can(permissions.VIEW_PORTFOLIO_ACTIVITY_LOG) and config.get("USE_AUDIT_LOG", False) %}
       {% include "fragments/audit_events_log.html" %}
       {{ Pagination(audit_events, url_for('portfolios.admin', portfolio_id=portfolio.id)) }}
     {% endif %}
diff --git a/tests/conftest.py b/tests/conftest.py
index 4b1c9111..0a75a48e 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -42,11 +42,11 @@ def app(request):
 def skip_audit_log(request):
     """
     Conditionally skip tests marked with 'audit_log' based on the 
-    AUDIT_LOG_FEATURE_TOGGLE config value.
+    USE_AUDIT_LOG config value.
     """
     config = make_config()
     if request.node.get_closest_marker("audit_log"):
-        use_audit_log = config.get("AUDIT_LOG_FEATURE_TOGGLE", False)
+        use_audit_log = config.get("USE_AUDIT_LOG", False)
         if not use_audit_log:
             pytest.skip("audit log feature flag disabled")