Skip to content

Commit ed9369f

Browse files
jperson1danswick
andauthored
Revert Hotfixes - Reenable Prod Backups and Remove Logging (#4591)
* Revert "Hotfix -- staffuser logging (#4585)" This reverts commit 12364b4. * Revert "Update create_staffusers.py (#4584)" This reverts commit 116e65d. * Revert "Temporarily limit backups to prod (#4583)" This reverts commit 448c3f9. * Apply suggestions from code review --------- Co-authored-by: Dan Swick <[email protected]>
1 parent a209b90 commit ed9369f

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

.github/workflows/deploy-application.yml

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ jobs:
7070
cf_command: update-user-provided-service fac-key-service -p '"{\"SAM_API_KEY\":\"${{ secrets.SAM_API_KEY }}\", \"DJANGO_SECRET_LOGIN_KEY\":\"${{ secrets.DJANGO_SECRET_LOGIN_KEY }}\", \"LOGIN_CLIENT_ID\":\"${{ secrets.LOGIN_CLIENT_ID }}\", \"SECRET_KEY\":\"${{ secrets.SECRET_KEY}}\"}"'
7171

7272
- name: Backup the database
73-
if: startsWith(github.ref, 'refs/tags/v1.')
7473
uses: cloud-gov/cg-cli-tools@main
7574
with:
7675
cf_username: ${{ secrets.CF_USERNAME }}

backend/users/management/commands/create_staffusers.py

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# flake8: noqa
21
from django.conf import settings
32
from django.contrib.auth import get_user_model
43
from django.contrib.auth.models import Group, Permission
@@ -17,9 +16,6 @@ class Command(BaseCommand):
1716

1817
def handle(self, *args, **kwargs):
1918
"""Create a group with readonly permissions."""
20-
logger.info(f"Permission dump ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
21-
logger.info(Permission.objects.all().values())
22-
2319
group_readonly, created = Group.objects.get_or_create(name="Read-only")
2420
readonly_codenames = [
2521
"view_access",
@@ -44,10 +40,7 @@ def handle(self, *args, **kwargs):
4440
]
4541
group_readonly.permissions.clear()
4642
for code in readonly_codenames:
47-
try:
48-
group_readonly.permissions.add(Permission.objects.get(codename=code))
49-
except Exception as e:
50-
logger.error(f"1. Failed to get ({code}) -- {e}")
43+
group_readonly.permissions.add(Permission.objects.get(codename=code))
5144
group_readonly.save()
5245

5346
"""Create a group with helpdesk permissions."""
@@ -65,10 +58,7 @@ def handle(self, *args, **kwargs):
6558
]
6659
group_helpdesk.permissions.clear()
6760
for code in helpdesk_codenames:
68-
try:
69-
group_helpdesk.permissions.add(Permission.objects.get(codename=code))
70-
except Exception as e:
71-
logger.error(f"2. Failed to get ({code}) -- {e}")
61+
group_helpdesk.permissions.add(Permission.objects.get(codename=code))
7262
group_helpdesk.save()
7363

7464
# read in staffusers JSON.

0 commit comments

Comments
 (0)