Skip to content

Commit e886b5b

Browse files
committed
Run isort and black on repository.py, update CHANGELOG
1 parent 6e98015 commit e886b5b

File tree

2 files changed

+23
-27
lines changed

2 files changed

+23
-27
lines changed

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Change Log
55
`X.Y.Z`_ (TBD-DD-DD)
66
---------------------
77

8+
* Optionally create RDS, Redis, memcached, elasticsearch services when creating
9+
an EKS cluster.
810
* TBD
911

1012

stack/repository.py

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
import awacs.ecr as ecr
22
from awacs.aws import Allow, AWSPrincipal, Policy, Statement
3-
from troposphere import (
4-
AWS_ACCOUNT_ID,
5-
AWS_REGION,
6-
Join,
7-
Output,
8-
Ref
9-
)
3+
from troposphere import AWS_ACCOUNT_ID, AWS_REGION, Join, Output, Ref
104
from troposphere.ecr import Repository
115

126
from .common import arn_prefix
@@ -27,14 +21,9 @@
2721
Statement(
2822
Sid="AllowPushPull",
2923
Effect=Allow,
30-
Principal=AWSPrincipal([
31-
Join("", [
32-
arn_prefix,
33-
":iam::",
34-
Ref(AWS_ACCOUNT_ID),
35-
":root",
36-
]),
37-
]),
24+
Principal=AWSPrincipal(
25+
[Join("", [arn_prefix, ":iam::", Ref(AWS_ACCOUNT_ID), ":root"])]
26+
),
3827
Action=[
3928
ecr.GetDownloadUrlForLayer,
4029
ecr.BatchGetImage,
@@ -45,20 +34,25 @@
4534
ecr.CompleteLayerUpload,
4635
],
4736
),
48-
]
37+
],
4938
),
5039
)
5140

5241

5342
# Output ECR repository URL
54-
template.add_output(Output(
55-
"RepositoryURL",
56-
Description="The docker repository URL",
57-
Value=Join("", [
58-
Ref(AWS_ACCOUNT_ID),
59-
".dkr.ecr.",
60-
Ref(AWS_REGION),
61-
".amazonaws.com/",
62-
Ref(repository),
63-
]),
64-
))
43+
template.add_output(
44+
Output(
45+
"RepositoryURL",
46+
Description="The docker repository URL",
47+
Value=Join(
48+
"",
49+
[
50+
Ref(AWS_ACCOUNT_ID),
51+
".dkr.ecr.",
52+
Ref(AWS_REGION),
53+
".amazonaws.com/",
54+
Ref(repository),
55+
],
56+
),
57+
)
58+
)

0 commit comments

Comments
 (0)