Skip to content
This repository was archived by the owner on Mar 27, 2023. It is now read-only.

Commit e0ec010

Browse files
committed
refactored cdk code
1 parent 6d2af68 commit e0ec010

File tree

4 files changed

+42
-21
lines changed

4 files changed

+42
-21
lines changed

awscdk/awscdk/backend.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ def __init__(
3636
command=["/start_prod.sh"],
3737
)
3838

39+
scope.assets.assets_bucket.grant_read_write(
40+
self.backend_task.task_role
41+
)
42+
43+
for secret in [scope.variables.django_secret_key, scope.rds.db_secret]:
44+
secret.grant_read(self.backend_task.task_role)
45+
3946
port_mapping = ecs.PortMapping(
4047
container_port=8000, protocol=ecs.Protocol.TCP
4148
)

awscdk/awscdk/backend_tasks.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ def __init__(
2525
self, "MigrateTask", family=f"{full_app_name}-migrate"
2626
)
2727

28+
for secret in [scope.variables.django_secret_key, scope.rds.db_secret]:
29+
secret.grant_read(self.migrate_task.task_role)
30+
2831
self.migrate_task.add_container(
2932
"MigrateCommand",
3033
image=image,
@@ -38,6 +41,13 @@ def __init__(
3841
self, "CollecstaticTask", family=f"{full_app_name}-collectstatic"
3942
)
4043

44+
scope.assets.assets_bucket.grant_read_write(
45+
self.collectstatic_task.task_role
46+
)
47+
48+
for secret in [scope.variables.django_secret_key, scope.rds.db_secret]:
49+
secret.grant_read(self.collectstatic_task.task_role)
50+
4151
self.collectstatic_task.add_container(
4252
"CollecstaticCommand",
4353
image=image,
@@ -55,6 +65,9 @@ def __init__(
5565
family=f"{full_app_name}-create-superuser",
5666
)
5767

68+
for secret in [scope.variables.django_secret_key, scope.rds.db_secret]:
69+
secret.grant_read(self.create_superuser_task.task_role)
70+
5871
self.create_superuser_task.add_container(
5972
"CreateSuperuserCommand",
6073
image=image,

awscdk/awscdk/cdk_app_root.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ def __init__(
139139
# TODO: loop over all task roles to grant bucket permissions
140140
# give the backend service read/write access to the assets bucket
141141
task_roles = [
142-
self.backend.backend_task.task_role,
143-
self.backend_tasks.collectstatic_task.task_role,
144-
self.backend_tasks.create_superuser_task.task_role,
142+
# self.backend.backend_task.task_role,
143+
# self.backend_tasks.collectstatic_task.task_role,
144+
# self.backend_tasks.create_superuser_task.task_role,
145145
# self.celery_worker_service.celery_default_worker_task.task_role,
146146
self.celery_worker_service.celery_default_worker_service.task_definition.task_role,
147147
]

awscdk/stack.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,6 +1400,25 @@ Resources:
14001400
Value: dev-mysite-com
14011401
Metadata:
14021402
aws:cdk:path: dev-mysite-com-stack/BackendTasks/MigrateTask/TaskRole/Resource
1403+
BackendTasksMigrateTaskTaskRoleDefaultPolicyB1599105:
1404+
Type: AWS::IAM::Policy
1405+
Properties:
1406+
PolicyDocument:
1407+
Statement:
1408+
- Action: secretsmanager:GetSecretValue
1409+
Effect: Allow
1410+
Resource:
1411+
Ref: VariablesDjangoSecretKeyE4FA41EE
1412+
- Action: secretsmanager:GetSecretValue
1413+
Effect: Allow
1414+
Resource:
1415+
Ref: RdsDBClusterDBSecret28397CCA
1416+
Version: "2012-10-17"
1417+
PolicyName: BackendTasksMigrateTaskTaskRoleDefaultPolicyB1599105
1418+
Roles:
1419+
- Ref: BackendTasksMigrateTaskTaskRoleAE7059C2
1420+
Metadata:
1421+
aws:cdk:path: dev-mysite-com-stack/BackendTasks/MigrateTask/TaskRole/DefaultPolicy/Resource
14031422
BackendTasksMigrateTask9BDCB431:
14041423
Type: AWS::ECS::TaskDefinition
14051424
Properties:
@@ -1746,24 +1765,6 @@ Resources:
17461765
Properties:
17471766
PolicyDocument:
17481767
Statement:
1749-
- Action:
1750-
- s3:GetObject*
1751-
- s3:GetBucket*
1752-
- s3:List*
1753-
- s3:DeleteObject*
1754-
- s3:PutObject*
1755-
- s3:Abort*
1756-
Effect: Allow
1757-
Resource:
1758-
- Fn::GetAtt:
1759-
- BackendAssetsAssetsBucket62473847
1760-
- Arn
1761-
- Fn::Join:
1762-
- ""
1763-
- - Fn::GetAtt:
1764-
- BackendAssetsAssetsBucket62473847
1765-
- Arn
1766-
- /*
17671768
- Action: secretsmanager:GetSecretValue
17681769
Effect: Allow
17691770
Resource:

0 commit comments

Comments
 (0)